Zach H 475c54bfe1 fix 1032 merge conflicts		2015-07-27 00:01:05 -04:00
..
resources	Merge pull request #1039 from ctrlaltca/update_oracle	2015-05-16 18:20:36 +02:00
src	fix 1032 merge conflicts	2015-07-27 00:01:05 -04:00
translations	Updated translations	2015-06-28 15:17:46 +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	Merge pull request #1197 from Cockatrice/cpp11	2015-07-13 13:23:18 -04:00
cockatrice.desktop	Updated Spanish translation	2011-07-16 11:38:57 +02:00
cockatrice.qrc	Merge pull request #1039 from ctrlaltca/update_oracle	2015-05-16 18:20:36 +02:00
cockatrice.rc	Included uninstaller for Windows version	2010-09-17 15:26:07 +02:00