The menu is now located on the game screen.
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Wed, 20 Jul 2011 08:36:58 +0000 (11:36 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Wed, 20 Jul 2011 08:36:58 +0000 (11:36 +0300)
The game is paused (and the menu revealed) by tapping the screen.
When tapping anything but menu items the game is unpaused.
All functionality of MainWindow has been moved to SeaScene and SeaView.
SeaView is the main widget now.

Merge branch 'onviewmenu' into harmattan

Conflicts:
mainwindow.cpp
qtc_packaging/debian_harmattan/README
qtc_packaging/debian_harmattan/changelog
qtc_packaging/debian_harmattan/copyright


Trivial merge