Gavin Bises 82ca261ec8 Merge remote-tracking branch 'origin/master' into mention_color ...

Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h

2015-02-01 13:29:50 -05:00

..

resources

Flag images for 249 countries with ISO 3166 codes

2015-01-28 00:08:14 +09:00

src

Merge remote-tracking branch 'origin/master' into mention_color

2015-02-01 13:29:50 -05:00

translations

Updated Korean Translation

2015-01-28 01:57: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

Flag images for 249 countries with ISO 3166 codes

2015-01-28 00:08:14 +09:00

cockatrice.rc

Included uninstaller for Windows version

2010-09-17 15:26:07 +02:00