diff options
| author | Dimitar Petrovski <dimeptr@gmail.com> | 2011-10-29 12:54:47 +0200 |
|---|---|---|
| committer | Dimitar Petrovski <dimeptr@gmail.com> | 2011-10-29 12:54:47 +0200 |
| commit | e593a990f708d73ca5c1ad7636e39662722bcf05 (patch) | |
| tree | 411500a6c33d56932b5478d875d63e27a63b9fb2 /HISTORY | |
| parent | 726d99a3ed5c12242e0e3c6416b3175c18dbedfd (diff) | |
| parent | b4da1b8b6dfec941cb97cc14c7fc14040a7695ff (diff) | |
| download | vdr-plugin-eepg-e593a990f708d73ca5c1ad7636e39662722bcf05.tar.gz vdr-plugin-eepg-e593a990f708d73ca5c1ad7636e39662722bcf05.tar.bz2 | |
Merge branch 'test-naepg2' into eit_test
use Tid to resolve conflicts with VDR
Diffstat (limited to 'HISTORY')
0 files changed, 0 insertions, 0 deletions