Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 09:31:42 +0000 (11:31 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 13 Aug 2010 09:31:42 +0000 (11:31 +0200)
commitdc1112886ea9bd1c0ae7932d2d2719ac91a8fa3f
treec29dfa2c7928c3c8494e6e4d593bd3651146d2a0
parent2978b9517b86dc6c9f603fc22596ce6a5cf51661
parent3d525c2ec55696ad44b6e2302d57287fe79ec6ff
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/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.h