Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Thu, 2 Sep 2010 13:22:05 +0000 (15:22 +0200)
committerPiotrek <ppilar11@gmail.com>
Thu, 2 Sep 2010 13:22:05 +0000 (15:22 +0200)
commitd87efdac5743196dbae222515ab86c6e321c3d98
tree31f7b88f6d21972b47c04e9b2ddb6b2754ae7408
parent01f086c3d07ac087ad710789f9ed17272e7a942c
parentcb47735be3559a6f68de2128b751230c32b99c7c
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
src/common/CommonDictInterface.h
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/DictManagerWidget.h
src/mdictionary/gui/SettingsWidget.cpp
src/mdictionary/gui/WelcomeScreenWidget.h
src/plugins/xdxf/xdxfplugin.h
30 files changed:
src/common/AccentsNormalizer.h
src/common/CommonDictInterface.h
src/common/DictDialog.h
src/common/GUIInterface.h
src/desktopWidget/MainWidget.h
src/mdictionary/backbone/BookmarkTranslations.h
src/mdictionary/backbone/Bookmarks.h
src/mdictionary/backbone/ConfigGenerator.h
src/mdictionary/backbone/backbone.cpp
src/mdictionary/backbone/backbone.h
src/mdictionary/gui/DictManagerWidget.cpp
src/mdictionary/gui/DictManagerWidget.h
src/mdictionary/gui/MainWindow.cpp
src/mdictionary/gui/MainWindow.h
src/mdictionary/gui/MenuTabWidget.cpp
src/mdictionary/gui/MenuWidget.cpp
src/mdictionary/gui/MenuWidget.h
src/mdictionary/gui/SearchBarWidget.cpp
src/mdictionary/gui/SearchBarWidget.h
src/mdictionary/gui/SettingsWidget.cpp
src/mdictionary/gui/WelcomeScreenWidget.h
src/plugins/google/GoogleDictDialog.h
src/plugins/google/GooglePlugin.cpp
src/plugins/google/GooglePlugin.h
src/plugins/google/GoogleSettingsDialog.h
src/plugins/xdxf/TranslationXdxf.h
src/plugins/xdxf/XdxfCachingDialog.cpp
src/plugins/xdxf/XdxfDictDialog.h
src/plugins/xdxf/XdxfLoadDialog.h
src/plugins/xdxf/xdxfplugin.h