Zach 601ada8473 Merge pull request #1484 from ctrlaltca/fix_f12 ... Fix loading of "increase life counter" shortcut in settings		2015-09-08 12:43:27 -04:00
..
resources	Merge with master	2015-08-31 22:55:46 +02:00
src	Merge pull request #1484 from ctrlaltca/fix_f12	2015-09-08 12:43:27 -04:00
translations	Fetched new translations. Arrr!	2015-08-27 18:32:14 +02:00
.qdevelop	icon_draw and icon_untap added, icon_general and icon_messages modified	2009-07-31 13:37:16 +02:00
CMakeLists.txt	Merge branch 'master' into Refactor-settings	2015-09-01 21:28:53 +02:00
cockatrice.desktop	Updated Spanish translation	2011-07-16 11:38:57 +02:00
cockatrice.qrc	Merge with master	2015-08-31 22:55:46 +02:00
cockatrice.rc	Included uninstaller for Windows version	2010-09-17 15:26:07 +02:00