Merge branch 'master' into devel

This commit is contained in:
Max-Wilhelm Bruker 2012-03-23 12:18:16 +01:00
commit 10d958c4ce
4 changed files with 11 additions and 2 deletions

View file

@ -33,6 +33,9 @@ CardItem::~CardItem()
{
prepareDelete();
if (scene())
static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
delete cardMenu;
delete ptMenu;
delete moveMenu;