Merge branch 'savingsettings' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sat, 23 Jul 2011 09:04:18 +0000 (12:04 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Sat, 23 Jul 2011 09:04:18 +0000 (12:04 +0300)
1  2 
seascene.cpp

diff --cc seascene.cpp
Simple merge