diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:58:04 +0200 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2014-04-14 09:58:04 +0200 |
| commit | 0223b8b98276b3f1c935325c9dcdf9b6484eb136 (patch) | |
| tree | eb14b0d3de1bacf3a300e508e15781b51810a82a /HISTORY | |
| parent | 970976d2758c659dc41ffabf9bc9b160c8fbc29b (diff) | |
| download | vdr-plugin-eepg-0223b8b98276b3f1c935325c9dcdf9b6484eb136.tar.gz vdr-plugin-eepg-0223b8b98276b3f1c935325c9dcdf9b6484eb136.tar.bz2 | |
fix wrong merge conflicts
Diffstat (limited to 'HISTORY')
0 files changed, 0 insertions, 0 deletions