Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 10:09:29 +0000 (11:09 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 10:09:29 +0000 (11:09 +0100)
commiteb480052819374706a71f479cc8b062806f8484c
treef38451a692fa60405eb4799da91f8f73042ea3cb
parentf86f31535d8c34e40a83e5a722b06a5a490af0da
parent7dd7dae9cc55a957c22cd4c3dd93d32d1deb5328
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
src/plugins/stardict/StarDialog.cpp
src/plugins/stardict/StarDictPlugin.cpp
src/plugins/stardict/en_US.ts
src/plugins/stardict/pl_PL.ts
src/plugins/stardict/StarDialog.cpp
src/plugins/stardict/StarDictPlugin.cpp
src/plugins/stardict/en_US.ts
src/plugins/stardict/pl_PL.ts