Merge branch 'master' of git://gitorious.org/phonon/phonon-vlc
authorHarald Sitter <sitter.harald@gmail.com>
Wed, 15 Dec 2010 14:18:09 +0000 (15:18 +0100)
committerHarald Sitter <sitter.harald@gmail.com>
Wed, 15 Dec 2010 14:18:09 +0000 (15:18 +0100)
commit85c00639a59e430b56b1a0aa2244883103d8d794
tree2755db7fb8fd0f36f06455216299bcb5b4de8c8f
parent2fc3017fd459cd47bddc8af1b5dc46a9741d343e
parenta8a9c88ca4c21552e6cd6c3d3c4674356fd8b82a
Merge branch 'master' of git://gitorious.org/phonon/phonon-vlc
vlc/backend.cpp