Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Fri, 17 Dec 2010 15:43:17 +0000 (16:43 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Fri, 17 Dec 2010 15:43:17 +0000 (16:43 +0100)
commit2e061e2df0f372f91a25be1958abe7b0a72b2f69
treecdc94fca264036602784972dcc0a22e4feb0d0fa
parent0eb244df0da2ac95f6868d7a77cf190c1ca49a11
parent6e43150fac4affb7e2cb3f6d50ee727bcddba9a1
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

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