Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
authorBartosz Szatkowski <bulislaw@linux.com>
Fri, 27 Aug 2010 06:23:05 +0000 (08:23 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Fri, 27 Aug 2010 06:23:05 +0000 (08:23 +0200)
commit77cce2e1cfd2342ed52252c72feb5cf3b7c8f4d1
tree52fa2def90401f18a428536e2aaefa1bab3a94f1
parent2d1efeceaaf84e881b83d4dc4adfb9ed7f942838
parent426bd1e5a3ef103ad55765dfce3320e8c7382434
Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
trunk/src/plugins/xdxf/src/xdxfplugin.cpp