Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 10:46:36 +0000 (12:46 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 10:46:36 +0000 (12:46 +0200)
commitf07e4f2fa7f256b73d337979693e9e8ef5eb79ae
treeb079197b1e309231123316733ae92cfb5a300809
parentdc1112886ea9bd1c0ae7932d2d2719ac91a8fa3f
parent62c997ae7099a55c1850b7d2a45d4473d919d572
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache

Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/XdxfLoadDialog.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp