Merge branch 'master' into disable_panels
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 11:25:32 +0000 (14:25 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 1 Sep 2010 11:25:32 +0000 (14:25 +0300)
commit3b51d9888cd853c8b976831c7a73c58021600086
treeb58b4063974f0934a91cf72f68acf632d210cc2a
parentd96b8b5bc71971630deaa2f37f9532c171799bba
parenteeee8fdd9e5a2c12a69a5238e42cd45c9ef677de
Merge branch 'master' into disable_panels

Conflicts:
src/ui/mainwindow.cpp
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h