Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Wed, 1 Sep 2010 13:04:28 +0000 (15:04 +0200)
committerPiotrek <ppilar11@gmail.com>
Wed, 1 Sep 2010 13:04:28 +0000 (15:04 +0200)
commit12dd076340b27026d80350a2bea664df6a12d51b
treede67dd839fe61be7d784acaa00339780f29a28ed
parentb67514e5c68a32ab05c5435f9f298422f70e07af
parentd87d8c6647d042828af8d163fdd39c2f02eab33f
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
data/icons/gui.qrc
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/main.cpp
trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
trunk/src/plugins/google/src/GoogleSettingsDialog.h