Merge branch 'master' into dev_local
authorZoltan Papp <zoltan.papp@ixonos.com>
Tue, 26 May 2009 11:50:09 +0000 (14:50 +0300)
committerZoltan Papp <zoltan.papp@ixonos.com>
Tue, 26 May 2009 11:50:09 +0000 (14:50 +0300)
commit100bffcd0e9a9a967be6da8e9977da3d94dc606a
treed9fdebf6106d8c4fe924797cf9930285535c1046
parent046f0345e7b3d35d86083bb38c5df541d857b265
parent658e4917f437e1f3bb214466ae91dc8fa0ea4705
Merge branch 'master' into dev_local

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