Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 2 Sep 2010 13:55:57 +0000 (15:55 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 2 Sep 2010 13:55:57 +0000 (15:55 +0200)
commit0dc88e0d9deeb4bd70ac4c9310f9d1c0526a5f20
tree52031235440b87ce38e713c40750c24c616dfce1
parentcedc148c2b953022c1f2e6c0f13ce7d95ec48979
parentd87efdac5743196dbae222515ab86c6e321c3d98
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
src/mdictionary/backbone/backbone.cpp
src/plugins/xdxf/XdxfLoadDialog.h