Merge branch 'cache'
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 23 Aug 2010 13:22:56 +0000 (15:22 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 23 Aug 2010 13:22:56 +0000 (15:22 +0200)
commitc3803b8013456900e4e4c27fa23d9ae56f29f309
tree4ff62dbc322f0fe9889c495d135a5020b6061955
parenta8b1aef791ea6fd8dd7d196ee749019b3075ce72
parente14e2ce1375108725a1249285ba76ab6cbcd1328
Merge branch 'cache'

Conflicts:
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/base/backbone/Bookmarks.cpp
trunk/src/base/gui/AboutWidget.cpp
trunk/src/base/gui/BookmarksWidget.cpp
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/gui/SettingsWidget.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp