Commit graph

5 commits

Author SHA1 Message Date
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
arxanas
7cbe410172 Fix #45: don't send tokens to deckstats. 2014-06-30 03:08:55 -04:00
Fabio Bas
7035150351 Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code 2014-06-25 09:07:02 +02:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Max-Wilhelm Bruker
44d688b1d5 added deckstats.net interface in deck editor, fixing issue #39 2012-05-17 20:11:46 +02:00