Merge branch 'master' into google
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 09:22:50 +0000 (11:22 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 09:22:50 +0000 (11:22 +0200)
commit5a66ee83a348006c49b884f4415430c0cfb3c4fc
tree7cc7dd14087cae17669d22bbf122f48539878a17
parentea48eaf23ca6710a07220a63826c7b5a4d58c0cf
parent66e89dc42bff22b077f02796683c579ba51f1e5a
Merge branch 'master' into google

Conflicts:
trunk/src/base/gui/WordListWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/base/backbone/Bookmarks.h
trunk/src/base/backbone/backbone.h
trunk/src/base/gui/DictTypeSelectDialog.h
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/WordListWidget.cpp
trunk/src/includes/CommonDictInterface.h
trunk/src/includes/settings.h
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.h
trunk/tests/mDictionaryTests/tst_Backbone.cpp