Merge branch 'base'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 12:31:24 +0000 (15:31 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 12:31:24 +0000 (15:31 +0300)
commit9236d52c5fe27bdd15474c90a1793441eb58a7ad
tree0eef239de6d87b306ba4177928ac593fbf238c58
parent68a2d00015d6d6d8a557de4c04d5f18ae2c22dc9
parent5ffd6d89882854d2d4f15107f817f4dc3a83eedb
Merge branch 'base'

Vibration menu item is now togglable

Conflicts:
seascene.cpp
seascene.cpp