Merge
authorMikko Siren <mikko.siren@ixonos.com>
Wed, 27 May 2009 14:14:44 +0000 (17:14 +0300)
committerMikko Siren <mikko.siren@ixonos.com>
Wed, 27 May 2009 14:14:44 +0000 (17:14 +0300)
commitbd153701307613c96e7bdf070cf32b0cbc6ae834
tree4ba042fb0fda51620e1cf6add974eab98a1f808a
parent44bef268493f65a3924c1d00688a447ce9c6871a
parenta0695f697226de46323a2d19cfad4e25d3e6de14
Merge
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/BusinessLogic/UIManager.cpp