Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 06:37:51 +0000 (08:37 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 06:37:51 +0000 (08:37 +0200)
commit99fdf94695a621052055def6a38164429aa84bff
tree72f821477fe3eddbaf2562a4be5c34aea652412b
parenteb17ab0eac27ed03c083c0c7bba567162798cd15
parentbec52fec72b599b27ea0d78f3acdfa18b951bdf9
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
src/plugins/google/GooglePlugin.cpp
src/plugins/xdxf/XdxfLoadDialog.cpp
src/plugins/xdxf/XdxfLoadDialog.h
src/plugins/xdxf/XdxfSettingsDialog.h
src/plugins/xdxf/xdxfplugin.cpp