Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 25 Aug 2010 07:08:03 +0000 (10:08 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 25 Aug 2010 07:08:03 +0000 (10:08 +0300)
commit2d91fc77b697cc491fcd7ff0bebadfe245327af0
tree3f1e4c264be3cac9546de491181e319543509115
parent005766e2428fcd7393c30f17e916de14037a52b9
parentb1d7167c1ec924ccbec52ee3097c662d925d7122
Merge branch 'master' into new_panels_with_context_buttons
src/ui/mainwindow.cpp