Merge branch 'qml'
authorjakub <jakub.jaszczynski@comarch.com>
Mon, 28 Feb 2011 14:23:49 +0000 (15:23 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Mon, 28 Feb 2011 14:23:49 +0000 (15:23 +0100)
commit29aa1caa7c232b517244c11463844a7b54fed22d
treeda0661dd02fac2488cc41852fe4c689eedce21b7
parent08e403fb8f97d1352819f64d81eeda2c65148a40
parent362cbb3c2c3ec1e28b6bf8dd20ff67f80fd5d35a
Merge branch 'qml'

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