Merge branch 'engine' into dev
authorKaj Wallin <kaj.wallin@ixonos.com>
Wed, 28 Apr 2010 08:24:17 +0000 (11:24 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Wed, 28 Apr 2010 08:24:17 +0000 (11:24 +0300)
commitb72cf24b4d39d0671ba6540581a346ed338f467f
treebf8e93989c821abd24c21e695f11a7f3b29d600e
parent839158e021532d2669ec76272d566a54eae16e1e
parentd322db622cdac3f4c72eb45c2f5128a088eee330
Merge branch 'engine' into dev

Conflicts:
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
src/ui/mapviewscreen.cpp