Merge branch 'master' into new_zoom_buttons_panel
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 13 May 2010 20:43:37 +0000 (23:43 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 13 May 2010 20:43:37 +0000 (23:43 +0300)
commitaf3174f55d2c1f22f6280f3bc03b3b6356ed646f
tree31279d5161662e9fc290f2c7946fc4620b01461e
parent07cf1b5d3dfc40f59e21412737e03e8db457bb7e
parent0f72cfff8d43f51c2b123057b603008431c1ca18
Merge branch 'master' into new_zoom_buttons_panel

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