Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Mon, 28 Feb 2011 14:34:12 +0000 (15:34 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Mon, 28 Feb 2011 14:34:12 +0000 (15:34 +0100)
commit11ada56e37ed724c4777ad2ac555eabe19c65c12
tree014421a771fab2db77ef099609a719c8bcf1115a
parentebd4c2c97364e18aae17e790155b8f4060981c37
parent29aa1caa7c232b517244c11463844a7b54fed22d
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
src/mdictionary/qml/WordListWidget.qml
src/mdictionary/qml/DictManagerWidget.qml
src/mdictionary/qml/WordListWidget.qml