Merged and resolved conflicts.
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 12:17:36 +0000 (15:17 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 12:17:36 +0000 (15:17 +0300)
commit34b6f94fe1681c8777f2314a5d6f66193f932fbf
treec5c26f8b5f28be6362a2d7e277ef0ece7e25acfb
parentce3e620f636f03bddb16d6dca90c3782887d9174
parentc4177d4dcffed05e254413793848769051f2d07e
Merged and resolved conflicts.
Merge branch 'jskia73' into wallika-own

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