Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Tue, 5 Oct 2010 13:44:50 +0000 (15:44 +0200)
committerPrzemyslaw Wojtysiak <pwojtysiak88@gmail.com>
Tue, 5 Oct 2010 13:44:50 +0000 (15:44 +0200)
commitcdfff8a49a07e55ff6a9fd59bdaf79116314b6d6
tree7c66fbf2f9ff26f40a15c429e34bb6c013980f6c
parentcf4c5f5f289c7760c392322344fe04b437a4575c
parent7d0de32eebb30f6aeaa02f722cbc2c722e140b0d
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
src/plugins/stardict/stardict.pro
src/plugins/stardict/stardict.pro