diff options
| author | horchi <vdr@jwendel.de> | 2017-12-21 18:26:57 +0100 |
|---|---|---|
| committer | horchi <vdr@jwendel.de> | 2017-12-21 18:26:57 +0100 |
| commit | 370d37dc3e5ee26755bdae61008ab18b12392e1c (patch) | |
| tree | a132c850e36a7cd70cf1effcc9d1ea3da3705ee4 /epg2vdr.c | |
| parent | 1fb464434a00a74bfb9ca50350d860718419c663 (diff) | |
| parent | c2b5d06502b07df9b7e321f2e64224af0786b754 (diff) | |
| download | vdr-plugin-epg2vdr-370d37dc3e5ee26755bdae61008ab18b12392e1c.tar.gz vdr-plugin-epg2vdr-370d37dc3e5ee26755bdae61008ab18b12392e1c.tar.bz2 | |
resolved merge conflict
Diffstat (limited to 'epg2vdr.c')
0 files changed, 0 insertions, 0 deletions