Max-Wilhelm Bruker e1a728328e Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice ... Conflicts: cockatrice/cockatrice.pro cockatrice/src/player.cpp		2010-05-29 16:42:14 +02:00
..
resources	changed some phase button icons	2010-05-10 18:05:04 +02:00
src	Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice	2010-05-29 16:42:14 +02:00
translations	load deck from clipboard; closing feature request 0000019	2010-05-28 16:41:59 +02:00
.qdevelop	icon_draw and icon_untap added, icon_general and icon_messages modified	2009-07-31 13:37:16 +02:00
cockatrice.desktop	desktop entry	2009-08-03 18:18:12 +02:00
cockatrice.pro	Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice	2010-05-29 16:42:14 +02:00
cockatrice.qrc	hand counter	2010-05-29 16:37:41 +02:00
cockatrice.rc	app icons for mac and windows	2010-05-08 17:15:40 +02:00
copying	initial commit	2009-03-13 22:50:41 +01:00
Doxyfile	initial commit	2009-03-13 22:50:41 +01:00