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 | 1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3 (patch) | |
| tree | 3331bcd0608de5e0903cde00cfb23064e27b380f /client | |
| parent | 2cb0ba6cf128f9263ff5d1d4695546dab84da768 (diff) | |
| parent | c06970123cd68bd1b2f2695326596430d236f230 (diff) | |
| download | vdr-plugin-streamdev-1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3.tar.gz vdr-plugin-streamdev-1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3.tar.bz2 | |
Merge branch 'switch_livetv'
Conflicts:
HISTORY
server/connection.c
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions