Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 06:20:08 +0000 (08:20 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 06:20:08 +0000 (08:20 +0200)
commit190e1b71f08ae1e864eda3cded51c7be75ab256d
tree854941b5add3a8a2464197f19c2d213803260fe6
parent95f8aaad24edde32849d9b6e99be47dacb19f324
parent04a206780e8c28968a94c694927cfeeb0d6b9cba
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

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