Merge branch 'master' of https://vcs.maemo.org/git/situare
authorlampehe-local <henri.lampela@ixonos.com>
Thu, 29 Apr 2010 09:22:44 +0000 (12:22 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Thu, 29 Apr 2010 09:22:44 +0000 (12:22 +0300)
commit34dc251aaf0d1a24dc2cf4d11e650c2d269646cc
treebf9ab8bb6188bfb3cc83ed234032d4f5a14c1104
parente27c08dc6f99bba9874e01bb27500e302343f57f
parenta7df8c16d693143adb917b5f50c7ebee3ae62b7f
Merge branch 'master' of https://vcs.maemo.org/git/situare

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