Merge branch 'master' into fullscreen_button_hide
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 11 Aug 2010 13:22:17 +0000 (16:22 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 11 Aug 2010 13:22:17 +0000 (16:22 +0300)
commit9078345bdc5f9f70adb3a9f1e4cbbc3e783fc145
tree012c5f605e97d7d13373a6dac662958d42351520
parent1d3b34144d3fa0dffab2ceb8619a3acaf0794eb3
parent0f5ed3633156c255d621de30e2da4e5c0c3dfd86
Merge branch 'master' into fullscreen_button_hide
src/ui/mainwindow.cpp
src/ui/mainwindow.h