Merge remote-tracking branch 'upstream/master'

Browse source

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

...

This commit is contained in:

Waleed Khan 2014-07-20 14:40:18 -04:00

parent 7cbe410172 1973df10e8

commit 359882917a

98 changed files with 5371 additions and 4720 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

895

common/decklist.cpp

View file

File diff suppressed because it is too large Load diff