Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorBartosz Szatkowski <bulislaw@linux.com>
Fri, 8 Oct 2010 11:52:03 +0000 (13:52 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Fri, 8 Oct 2010 11:52:03 +0000 (13:52 +0200)
commitb6fa2a53b0243b5912e3d32a17144698984e4be8
tree3b340f9d87688c5c30b2c1356f64af7f8c0ea9c0
parent2dca93aea7c244bd7b8ddf271765d98f9529ccd2
parent967fff0fe94f86eb1499b18c86eba472709c5dd7
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

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