Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 13 Sep 2010 13:14:42 +0000 (15:14 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 13 Sep 2010 13:14:42 +0000 (15:14 +0200)
commit14cb9cc957bcdc9c39af54ba168c6816a1910a2d
tree57f62b28a51ac99a5adef64960b65ca9aee176a8
parent84a7bb82879466daead05222751cfd5c6cdae42f
parent846d5db30d50087b73da55c0218f5f7953dfbf26
Merge branch 'master' into google

Conflicts:
src/include/CommonDictInterface.h
src/mdictionary/backbone/backbone.h
src/plugins/google/GooglePlugin.h
src/plugins/xdxf/xdxfplugin.h
src/include/CommonDictInterface.h
src/include/translation.h
src/mdictionary/backbone/Bookmarks.h
src/mdictionary/backbone/backbone.h
src/mdictionary/gui/TranslationWidget.h
src/plugins/google/GooglePlugin.h
src/plugins/google/TranslationGoogle.h
src/plugins/xdxf/TranslationXdxf.h
src/plugins/xdxf/xdxfplugin.cpp
src/plugins/xdxf/xdxfplugin.h