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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge