diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2011-03-18 15:56:34 +0100 |
| commit | 17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a (patch) | |
| tree | fc7a92c2f3ca24c21891ec54f1ebb5785fc56487 /server/streamer.c | |
| parent | 58a4f3dbe5888d6da81b401154a8b4c778ff228a (diff) | |
| parent | 1a933d6cc9344bd7e7ded82eb775cc0c61ed0ae3 (diff) | |
| download | vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.gz vdr-plugin-streamdev-17bb6390f9883a1f029ffe4caaa4cc130fcb8b7a.tar.bz2 | |
Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-streamdev
Conflicts:
HISTORY
Diffstat (limited to 'server/streamer.c')
0 files changed, 0 insertions, 0 deletions