Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 2 Sep 2010 11:53:18 +0000 (13:53 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 2 Sep 2010 11:53:18 +0000 (13:53 +0200)
commit6da6f1f342510084bb896b24b33b45df2a495db3
tree2026da68933efae9836a942e87d50c93e8652afc
parentc7a8e1dcfb57622e2cbcd84491194c291ce9a27e
parent849177861d4fd39904e1121e55f5896a70b1d6f6
Merge branch 'master' into google

Conflicts:
trunk/src/plugins/google/src/GooglePlugin.cpp
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
trunk/src/base/gui/DictManagerWidget.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp