gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-30 14:42:00 -08:00
Code Issues Packages Projects Releases Wiki Activity
Files
7cdd2a26f613c19a5d9b249480087ca27abdfc19
Cockatrice/common/decklist.h
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

7.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink