Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote
authorYann Nave <ynave@ynave-laptop.(none)>
Sat, 7 Aug 2010 19:47:53 +0000 (21:47 +0200)
committerYann Nave <ynave@ynave-laptop.(none)>
Sat, 7 Aug 2010 19:47:53 +0000 (21:47 +0200)
1  2 
vlcRemote.pro

diff --cc vlcRemote.pro
Simple merge