Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Wed, 27 May 2009 06:40:54 +0000 (09:40 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Wed, 27 May 2009 06:40:54 +0000 (09:40 +0300)
commitc573fb9449322aa2fd5902eb81ac192fc290070a
treec403d596927ea35c56d9987208f8de3e053b223f
parent100bffcd0e9a9a967be6da8e9977da3d94dc606a
parent56f763c68a2ff56d344ef150b7378ca417d08b36
Merge branch 'master' into dev_local

Conflicts:
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.h
src/UserInterface/WindowManager.cpp