Fabio Bas 2101ed7096 Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt ... Conflicts: cockatrice/src/dlg_settings.cpp cockatrice/src/dlg_settings.h		2015-01-05 22:46:12 +01:00
..
resources	Updated Search Bar Style	2014-11-09 12:04:09 +01:00
src	Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt	2015-01-05 22:46:12 +01:00
translations	Fixed a non-standard word in Korean Translation	2015-01-03 11:24:10 +09: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 pull request #500 from ctrlaltca/translation_fixes	2015-01-01 08:07:06 -05:00
cockatrice.desktop	Updated Spanish translation	2011-07-16 11:38:57 +02:00
cockatrice.qrc	Updated Search Bar Style	2014-11-09 12:04:09 +01:00
cockatrice.rc	Included uninstaller for Windows version	2010-09-17 15:26:07 +02:00