Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorMarcin Kazmierczak <marcin.kazmierczak@comarch.pl>
Tue, 5 Oct 2010 14:05:31 +0000 (16:05 +0200)
committerMarcin Kazmierczak <marcin.kazmierczak@comarch.pl>
Tue, 5 Oct 2010 14:05:31 +0000 (16:05 +0200)
commit8f668304b6b3756a00cf76f695bf475fa39cdae4
treef8de7414bd94b21cec84d541d610f180b02bdee0
parent83e28f5e15a57bb71f6c9e2a3b6f54b65f7b0e04
parent046e1632eeab5707f258b523d007b12a300ca0e5
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
src/plugins/stardict/StarDialog.cpp
src/plugins/stardict/StarDialog.cpp
src/plugins/stardict/StarDialog.h