woogerboy21 021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server ...

Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp

2014-07-18 23:46:56 -04:00

..

resources

Revert "Merge pull request #89 from dylan/master"

2014-06-19 22:11:20 -04:00

src

Merge remote-tracking branch 'upstream/master' into registered-user-only-server

2014-07-18 23:46:56 -04: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

Cmake reorganization

2014-06-28 19:39:26 +02: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