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)
Conflicts:
trunk/src/plugins/xdxf/tests/test.cpp

1  2 
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/tests/test.cpp

Simple merge