Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 6 Oct 2010 08:03:55 +0000 (10:03 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 6 Oct 2010 08:03:55 +0000 (10:03 +0200)
commit0d5d3c24cb6303fc0ba21cc516fac1b62111075b
tree6a980d86712c6eb77eb782eb2cac40cabaa80566
parent2912389ccfcab253934b9c66263c620f2d8aca36
parente8753f6d109d5191ca63f7f25cc30f9738272f2e
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

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