Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5 ... Conflicts: cockatrice/src/main.cpp		2014-06-28 09:13:10 -04:00
..
src	Merge branch 'master' into cmake_qt5	2014-06-28 09:13:10 -04:00
CMakeLists.txt	Install libraries and plugins automatically under windows	2014-06-27 17:40:29 +02:00
oracle.desktop	added unix desktop icons and menu items to install target	2012-01-29 18:30:02 +01:00