Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 08:21:03 +0000 (10:21 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 08:21:03 +0000 (10:21 +0200)
commitc5ed88623b1ec9b78222ed1d485eb2329c8cca9b
treea83e76c7ba5a0a44fdbcec7458a69611e9ecb905
parent49bc49758291ccd86f20583c99a98692b7ab52a1
parent2df812e7992fa1fd3ed63af319804c12cb206124
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
src/plugins/google/TranslationGoogle.cpp
src/plugins/xdxf/TranslationXdxf.cpp
src/plugins/xdxf/TranslationXdxf.h