sylvanbasilisk 0770626270 Merge branch 'master' into editor-redesign ... Conflicts: cockatrice/src/carddatabasemodel.cpp cockatrice/src/carddatabasemodel.h cockatrice/src/decklistmodel.cpp cockatrice/src/decklistmodel.h cockatrice/src/tab_deck_editor.cpp cockatrice/src/tab_deck_editor.h		2014-03-25 02:10:52 +00:00
..
resources	added Georgia to countries	2013-01-19 16:14:47 +01:00
src	Merge branch 'master' into editor-redesign	2014-03-25 02:10:52 +00:00
translations	added missing retranslateUi() call in TabMessage; minor Swedish fixes	2012-06-25 12:16:02 +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	refactored deck editor UI key shortcuts	2014-03-24 21:03:26 +00:00
cockatrice.desktop	Updated Spanish translation	2011-07-16 11:38:57 +02:00
cockatrice.qrc	added Georgia to countries	2013-01-19 16:14:47 +01:00
cockatrice.rc	Included uninstaller for Windows version	2010-09-17 15:26:07 +02:00
FindQtMobility.cmake	switched from qmake to cmake	2012-01-21 19:21:57 +01:00