Merge branch 'master' into indicator
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Jul 2010 12:48:26 +0000 (15:48 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 29 Jul 2010 12:48:26 +0000 (15:48 +0300)
commit3a9fe92777980ceb0ec0a32bf304790ad83d176a
treef87811d3bf16ead1cb2b335762ff8211adcc01bb
parent15a1c52ca0f7161788423ec804940e71d469d23f
parentdb83fd0978acc039adf25ec8c91054da78111fd6
Merge branch 'master' into indicator
src/engine/engine.cpp
src/engine/engine.h
src/ui/indicatorbutton.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h