Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 14:13:17 +0000 (17:13 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 14:13:17 +0000 (17:13 +0300)
commit389d6e1a6cce2647cbb654c47713d0ecf3115af7
treec73176f069c34f12b4071abe0eb2ed6457a248b9
parent26c03aa9bb60c76d7977145143e4ff0ca133c93a
parent2e76f2ebce686aeceada41516c6d79195f76913a
Merge branch 'integration' of https://vcs.maemo.org/git/situare into integration

Conflicts:
images.qrc
src/ui/mainwindow.cpp
src/ui/mainwindow.h