Merge branch 'master' into qmake
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 2 Sep 2010 12:18:31 +0000 (14:18 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Thu, 2 Sep 2010 12:18:31 +0000 (14:18 +0200)
commitcb47735be3559a6f68de2128b751230c32b99c7c
treed37ae1df20c3d7bc8d87373ed09cd1ca3a946b9c
parent6552e14c830b3de28e1688b8a6b94c09317beac1
parent64d5696024333033d3f1609b689a579195c1f966
Merge branch 'master' into qmake

Conflicts:
mdictionary.pro
src/mdictionary/gui/WordListWidget.cpp
trunk/src/base/base.pro
trunk/src/plugins/xdxf/src/src.pro
17 files changed:
src/common/translation.h
src/mdictionary/backbone/BookmarkTranslations.h
src/mdictionary/backbone/Bookmarks.cpp
src/mdictionary/backbone/Bookmarks.h
src/mdictionary/backbone/backbone.cpp
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/SearchBarWidget.cpp
src/mdictionary/gui/TranslationWidget.cpp
src/mdictionary/gui/WordListWidget.cpp
src/mdictionary/gui/WordListWidget.h
src/plugins/google/GooglePlugin.cpp
src/plugins/google/GoogleSettingsDialog.cpp
src/plugins/xdxf/TranslationXdxf.cpp
src/plugins/xdxf/XdxfLoadDialog.cpp
src/plugins/xdxf/XdxfSettingsDialog.cpp
src/plugins/xdxf/xdxfplugin.cpp
tests/XdxfPluginTests/test.cpp