]> git.vomp.tv Git - vompclient.git/commitdiff
Merge branch 'master' of git.vomp.tv:/vompclient-raspi into 0-4-0rc
authorChris Tallon <chris@vomp.tv>
Sat, 19 Jan 2013 18:43:04 +0000 (18:43 +0000)
committerChris Tallon <chris@vomp.tv>
Sat, 19 Jan 2013 18:43:04 +0000 (18:43 +0000)
1  2 
vdr.cc

diff --cc vdr.cc
Simple merge