Merge branch 'new_info_panels'
authorKaj Wallin <kaj.wallin@ixonos.com>
Tue, 18 May 2010 06:11:13 +0000 (09:11 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Tue, 18 May 2010 06:11:13 +0000 (09:11 +0300)
commitae87faaa11eec3c587f902571f7f9d1a75fe554c
tree2ab2cc582ad13c560e9f82d2cdf736085f432369
parent4f1728297979fb2e51017b142c4c18238f66f452
parent15f4fc734fe3194aabddf82f03d158b28cdc59f4
Merge branch 'new_info_panels'

Conflicts:
src/ui/userpanel.cpp
src/ui/userpanel.h
images.qrc
src/ui/mapviewscreen.cpp
src/ui/userpanel.cpp
src/ui/userpanel.h