diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-03-07 23:06:27 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-03-07 23:06:27 +0100 |
| commit | 87de8aeff6a3d600e7c1d9ed910bc40b98ab969e (patch) | |
| tree | 3331bcd0608de5e0903cde00cfb23064e27b380f /server/streamer.c | |
| parent | 79fe54e476fcdb7a770bffe6d4754f246db289d3 (diff) | |
| parent | 74ce99971c59d960babf163c191d6014a2a32c81 (diff) | |
| download | vdr-plugin-streamdev-87de8aeff6a3d600e7c1d9ed910bc40b98ab969e.tar.gz vdr-plugin-streamdev-87de8aeff6a3d600e7c1d9ed910bc40b98ab969e.tar.bz2 | |
Merge branch 'switch_livetv'
Conflicts:
HISTORY
server/connection.c
Diffstat (limited to 'server/streamer.c')
0 files changed, 0 insertions, 0 deletions