Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 23 Aug 2010 07:58:59 +0000 (09:58 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 23 Aug 2010 07:58:59 +0000 (09:58 +0200)
1  2 
trunk/src/base/gui/AboutWidget.cpp
trunk/src/base/gui/MainWindow.cpp

Simple merge
Simple merge