Merge branch 'master' into scalable_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 15 Jun 2010 08:40:13 +0000 (11:40 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 15 Jun 2010 08:40:13 +0000 (11:40 +0300)
commit8fb2897074fab5e381ff028616c227b507e11202
tree2870d57830f6453db5137017bdd7b65ea8fa940e
parentf9756a237965f03ec1220bf89b35f79a0737f506
parentda84a363b4a8007351d3b97e43d4d2d784037271
Merge branch 'master' into scalable_panels

Conflicts:
src/map/baselocationitem.h
src/map/baselocationitem.h
src/ui/mainwindow.cpp