Jeff e9bad2cacb Merge branch 'master' into fix_1387 ... Conflicts: cockatrice/CMakeLists.txt cockatrice/src/tab_game.h cockatrice/src/tab_room.cpp		2015-08-20 22:23:47 -04:00
..
resources	Configurable shortcuts	2015-08-16 13:46:57 +02:00
src	Merge branch 'master' into fix_1387	2015-08-20 22:23:47 -04:00
translations	Updated translations	2015-08-01 10:55:06 +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 fix_1387	2015-08-20 22:23:47 -04:00
cockatrice.desktop	Updated Spanish translation	2011-07-16 11:38:57 +02:00
cockatrice.qrc	Configurable shortcuts	2015-08-16 13:46:57 +02:00
cockatrice.rc	Included uninstaller for Windows version	2010-09-17 15:26:07 +02:00