Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5 ... Conflicts: cockatrice/src/main.cpp		2014-06-28 09:13:10 -04:00
..
main.cpp	Ported oracle to Qt5	2014-06-24 18:28:09 +02:00
oracleimporter.cpp	Merge remote-tracking branch 'upstream/master' into cmake_qt5	2014-06-24 18:13:26 +02:00
oracleimporter.h	Fix some warnings	2014-06-27 22:19:23 -04:00
oraclewizard.cpp	#include <QtConcurrent> only for qt5, qt4 has this in QtCore	2014-06-25 19:28:03 +02:00
oraclewizard.h	Add an unexposed config value for the AllSets.json file url	2014-06-21 12:10:04 +02:00