Merge branch 'remove_list_view'
authorKaj Wallin <kaj.wallin@ixonos.com>
Tue, 11 May 2010 10:14:15 +0000 (13:14 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Tue, 11 May 2010 10:14:15 +0000 (13:14 +0300)
commit1f06f62f6376801a28aa504a295d6dea84673ff8
tree6e4d64ba821a3e01c8494f1f483f68284dcd652c
parent971f9371813343e6c46579e52d687df79c90586d
parent6dbeb8d60e6bd6d69947e03afe048d64ccd2a9ed
Merge branch 'remove_list_view'

Conflicts:
src/ui/mainwindow.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp