Added engine to master
authorKaj Wallin <kaj.wallin@ixonos.com>
Thu, 29 Apr 2010 13:03:02 +0000 (16:03 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Thu, 29 Apr 2010 13:03:02 +0000 (16:03 +0300)
commit8c71a3f6025e52f0a502bd0a4dfae19019b68456
tree6918318d1c4f7e967d3c4070034125eedf826b15
parent3acec80576c9dd868d9dee698aff6b34371d3790
parent82d09b076659bba0540ff5c7f1273d93eeca26e2
Added engine to master

Reviewed by: Marko Niemelä

Merge branch 'engine'

Conflicts:
src/engine/engine.cpp
src/engine/engine.cpp
src/engine/engine.h
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/ui/mainwindow.h