]> git.vomp.tv Git - vompserver.git/commitdiff
projects / vompserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73cbde8 95a2075)
Merge branch 'master' of git.vomp.tv:vompserver
authorChris Tallon <chris@telescope.org>
Sat, 2 Jun 2012 16:23:25 +0000 (17:23 +0100)
committerChris Tallon <chris@telescope.org>
Sat, 2 Jun 2012 16:23:25 +0000 (17:23 +0100)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Plugin for VDR to support VOMP clients