jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 13:00:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
Cockatrice/cockatrice
History
Gavin Bises f515f4a8fe Merge remote-tracking branch 'origin/master' into chat_buddy 
Conflict is from country code display in user box

Conflicts:
	cockatrice/src/userinfobox.cpp
2015-01-31 08:03:13 -05:00
..
resources Buddy stars 2015-01-28 21:09:02 +01:00
src Merge remote-tracking branch 'origin/master' into chat_buddy 2015-01-31 08:03:13 -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 Buddy stars 2015-01-28 21:09:02 +01:00
cockatrice.rc Included uninstaller for Windows version 2010-09-17 15:26:07 +02:00