Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Thu, 30 Dec 2010 15:40:54 +0000 (16:40 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Thu, 30 Dec 2010 15:40:54 +0000 (16:40 +0100)
commit1d965ced7a948998a34497324c82685d724b00d1
tree021d726bea274ec5c4574d8e8594f41f863f0e27
parent08831de55e3e5d82575f8deb52a0c3d20d9589b7
parent30df3ecbc1bebce294f39c9b18393446e18047b9
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

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