Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 26 Aug 2010 06:47:46 +0000 (08:47 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 26 Aug 2010 06:47:46 +0000 (08:47 +0200)
commit9660133be5aa271331c77b7c4bf395af184b2f6a
tree5f1a5a6d6fab02936d563619bde84e90faa22530
parent1ca94b3e0480aa432eac4189e46318344e0f604b
parentb5ef2c7eac17b6b9b9c9fbebeab07fe76f88b9a7
Merge branch 'master' into google

Conflicts:
trunk/src/base/backbone/backbone.cpp
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/base/gui/SearchBarWidget.cpp
12 files changed:
trunk/src/base/backbone/backbone.cpp
trunk/src/base/backbone/backbone.h
trunk/src/base/gui/BookmarksWidget.h
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/base/gui/DictManagerWidget.h
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/MainWindow.h
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/gui/SettingsWidget.cpp
trunk/src/base/gui/SettingsWidget.h
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp