Waleed Khan 40e97140d6 Merge remote-tracking branch 'upstream/master' ... Conflicts: cockatrice/src/carddatabase.cpp		2014-07-23 00:49:13 -04:00
..
main.cpp	Ported oracle to Qt5	2014-06-24 18:28:09 +02:00
oracleimporter.cpp	Merge remote-tracking branch 'upstream/master'	2014-07-23 00:49:13 -04: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