Merge branch 'master' into laitiju
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 1 Apr 2010 10:33:17 +0000 (13:33 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 1 Apr 2010 10:33:17 +0000 (13:33 +0300)
commit82e4f48b385cba3d032f4dbf49b69b81a38af051
tree770debc7f4e7703e59b671f69a3713cc74d19cde
parent54d5f680a4cfce6b6f5d0c0e5576ea6ecfb9fa7c
parent8f382d55d8773ef74c6741ad1a1cc8728defb66c
Merge branch 'master' into laitiju

Conflicts:
situare.pro
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
tests/testUI/testUI/testUI.pro
tests/testUI/testtabs/testtabs.cpp
situare.pro
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h