Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 24 Aug 2010 13:14:47 +0000 (15:14 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 24 Aug 2010 13:14:47 +0000 (15:14 +0200)
commit97f8debedc7520add3ba4212bad4a7a4d999495b
treebe9f61c812c4e06cfdc194cc659a8e9a3a919f78
parente14e2ce1375108725a1249285ba76ab6cbcd1328
parent3e7118bfec64f44b11205ca836cb1a82c725d123
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache

Conflicts:
trunk/src/base/gui/MenuWidget.cpp
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/xsl.xsl
trunk/src/plugins/xdxf/src/xdxfplugin.h
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/MenuWidget.cpp
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/gui/SettingsWidget.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/xsl.xsl
trunk/src/includes/settings.h
trunk/src/plugins/xdxf/src/XdxfDictDialog.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.h