Merge branch 'master' into settings_auto_update
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 1 Jun 2010 05:56:35 +0000 (08:56 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 1 Jun 2010 05:56:35 +0000 (08:56 +0300)
commit5371f4e3509a6e848fca826cbf6212caa4643d65
treefe8b6d4e79d3f5aa6c162e82ef3368831c7d19c3
parentd2f16ca82d12cb9104fef4af65f1a8b10813c71e
parent19e1291ccfcbed9ec6ac77d4f6bebf8d19b4700a
Merge branch 'master' into settings_auto_update

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