Merge branch 'savingsettings' into base
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 11:43:27 +0000 (14:43 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 11:43:27 +0000 (14:43 +0300)
commit615218f5e8b5a4a96f7d9585e4b2d17d1d19a3b0
tree310d6e6cba38e7b742ebbc6a0c143430c9ebe141
parent4d2372fbb866d4d264e91ee3dd7a8808af440bf3
parent38beff7cdff5e7e52fe16247bf72949b429c137d
Merge branch 'savingsettings' into base

Conflicts:
seascene.cpp
seascene.cpp