Waleed Khan 359882917a Merge remote-tracking branch 'upstream/master' ... Some tabs to spaces, and maybe fixed to work with Qt 5. Conflicts: cockatrice/src/deckstats_interface.cpp common/decklist.cpp common/decklist.h oracle/src/oracleimporter.cpp		2014-07-20 14:40:18 -04:00
..
src	Merge remote-tracking branch 'upstream/master'	2014-07-20 14:40:18 -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