Merge branch 'master' of git://gitorious.org/phonon/phonon-vlc
-rw-r--r-- 75 .gitignore
-rw-r--r-- 277 AUTHORS
-rw-r--r-- 14060 CMakeLists.txt
-rw-r--r-- 24485 COPYING.LIB
drwxr-xr-x - cmake
-rw-r--r-- 991 cmake_uninstall.cmake.in
drwxr-xr-x - test
drwxr-xr-x - vlc