Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 15 Sep 2010 08:44:12 +0000 (10:44 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 15 Sep 2010 08:44:12 +0000 (10:44 +0200)
commitae4c4b50e14b5c30b3e66e08c98094b97671890f
tree9cd6df3a416ff9695e48632741d2ca9138efe054
parentf3808902ca529aeac6751be9416355d79afd42de
parent4f1903f908539d589ab17b79caffb187b5211597
Merge branch 'master' into google
src/include/translation.h
src/mdictionary/backbone/BookmarkTranslations.h
src/mdictionary/backbone/Bookmarks.cpp
src/mdictionary/backbone/Bookmarks.h
src/mdictionary/backbone/backbone.cpp
src/mdictionary/gui/MainWindow.cpp
src/plugins/google/GoogleDialog.cpp
src/plugins/google/TranslationGoogle.h
src/plugins/xdxf/TranslationXdxf.h