Merge branch 'logout_refactored'
authorlampehe-local <henri.lampela@ixonos.com>
Mon, 24 May 2010 12:01:29 +0000 (15:01 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Mon, 24 May 2010 12:01:29 +0000 (15:01 +0300)
commitc8c0bab969613e6494151316256e19694561be96
tree805521b7f7385e1a74f4f849f84aa2c81ce789a5
parentacef849fe85a677fb05ff335e01ebfc3a4c1d1ba
parent2555375bb3fb935f8007c50f89c647e19f187346
Merge branch 'logout_refactored'

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