Merge branch 'master' into gregoa
-rw-r--r-- 6 .gitignore
-rw-r--r-- 207 CMakeLists.txt
-rw-r--r-- 8921 README
drwxr-xr-x - conf
drwxr-xr-x - debian
drwxr-xr-x - gtkfisheyelist
drwxr-xr-x - hooks
drwxr-xr-x - icons
drwxr-xr-x - old
drwxr-xr-x - player
drwxr-xr-x - plugins
drwxr-xr-x - polygen
-rwxr-xr-x 264 run
drwxr-xr-x - src
-rw-r--r-- 2714 vala.cmake
drwxr-xr-x - zavai