Compiles again
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 12 Sep 2011 17:34:36 +0000 (20:34 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 12 Sep 2011 17:34:36 +0000 (20:34 +0300)
Mergetool put one { in wrong place, fixed.

seascene.cpp

index 59a5ddc..85a72bb 100644 (file)
@@ -784,7 +784,7 @@ void SeaScene::turnPauseOn()
     pPauseAction_->setChecked(true);
 }
 
-}
+
 
 void SeaScene::createLevelCompletedItems()
 {
@@ -799,3 +799,4 @@ void SeaScene::createLevelCompletedItems()
     pTapForNextLevelItem->setPos(-60,100);
     pTapForNextLevelItem->setZValue(1000);
     pTapForNextLevelItem->setHtml("<font size=\"5\" color = darkorange>Tap to start the next level");
+}