Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
authorPiotrek <ppilar11@gmail.com>
Wed, 18 Aug 2010 09:46:16 +0000 (11:46 +0200)
committerPiotrek <ppilar11@gmail.com>
Wed, 18 Aug 2010 09:46:16 +0000 (11:46 +0200)
commitb1988963f4d13e851867c0673dcab23fca54b12f
tree195254efb32a5e256ef1b9e4e3b00f4701ce9bd9
parenta6122f46936ec724c0ebd3280dd62479d2234e12
parentfb39a9f80f4105a2dea8b265138d897997ccb74a
Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache

Conflicts:
trunk/src/plugins/xdxf/tests/test.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/tests/test.cpp