Merge branch 'levelstructure'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 5 Jul 2011 15:56:37 +0000 (18:56 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 5 Jul 2011 15:56:37 +0000 (18:56 +0300)
commit1613bf0f9fb8f7422dc6f92bbe43ce318d6bd9e1
tree7ef193730be8f28ee262931ec36358f3708d0eab
parenteddc1ffd564cce990285909b8575726e5252a8e7
parent321e64696fc58b35759ab5e6cc9b2b2318499f73
Merge branch 'levelstructure'

Conflicts:
mainwindow.cpp

Multiple levels now supported. 5 levels now.
"Restart game" added to the menu.
ghostsoverboard.pro
mainwindow.cpp
mainwindow.h
seascene.cpp
seascene.h