Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 6 Oct 2010 10:01:55 +0000 (12:01 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 6 Oct 2010 10:01:55 +0000 (12:01 +0200)
commit509d0a52be26670b08684d8d06d314ba30fb7346
treeb3f575fbf08bb9fdbac7a462e047cbb39ad27656
parentd87e4eeb1f391b40476cd8789a1fb8bec1485745
parent0e5995ae8adfb8ab80385d040b0ea19d3ea6759b
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

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