Merge branch 'victoryscreen'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 26 Jul 2011 13:02:02 +0000 (16:02 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 26 Jul 2011 13:02:02 +0000 (16:02 +0300)
commitfc59090da28a9adeb50ddefc25aac843c4dfff99
tree0ff7bae25ee2387b5d48e20dd1a7d51f89da030e
parent3ffba2cef65df1beeb1797099d8d8c99f98a0acb
parent7b6d7bf80f942b862b224227891bf586f4a65720
Merge branch 'victoryscreen'

Victory dialog integrated to view/scene

Conflicts:
seascene.cpp
seascene.h
seascene.cpp
seascene.h