Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Fri, 21 Jan 2011 08:58:24 +0000 (09:58 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Fri, 21 Jan 2011 08:58:24 +0000 (09:58 +0100)
commitf398f7e3985c755407a9172468fe94b903bedb49
tree55d3203dc9ada1dfdb0ead1508ec9fae9c6b33bc
parentbeb2f8a40b5d1770c9727c1df18fe233639d8862
parent55f992f401bdf13a2dc6bdc370a56000bd2914c2
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
src/mdictionary/mdictionary.pro
src/mdictionary/mdictionary.pro