Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Tue, 14 Dec 2010 08:50:00 +0000 (09:50 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Tue, 14 Dec 2010 08:50:00 +0000 (09:50 +0100)
commit4cb16abfc532777b32ce3489dcc36fa44b6a0e1b
tree5a8a632eb5451f1b257cffbb8b21142d7585357d
parentbe63f2df3539bacf2ee5bf0a4f21eee5c0a18314
parent5fc81a4ae588b2616381820b99a09b5f0669bc01
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

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