Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Wed, 6 Oct 2010 11:55:35 +0000 (13:55 +0200)
committerPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Wed, 6 Oct 2010 11:55:35 +0000 (13:55 +0200)
commitedb43664fb669560ad23b301078331a077a52af7
treee8cbb7bfa3a9b4029285d28c8d2fccd4e02b9dc8
parentf19d111299541a34106e74fd9df83e683887deaa
parent509d0a52be26670b08684d8d06d314ba30fb7346
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
src/plugins/stardict/TranslationStarDict.cpp
src/plugins/stardict/StarDictPlugin.cpp
src/plugins/stardict/TranslationStarDict.cpp