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)
1  2 
src/ui/mainwindow.cpp

Simple merge