Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 11 Aug 2010 10:32:22 +0000 (12:32 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 11 Aug 2010 10:32:22 +0000 (12:32 +0200)
commit166389a8944478175c97f25a1379bad13c875f5d
tree3ec7a7299b88b9e4794e3d4427ce5aa2a73f9e49
parent8d4564830fc742edbfa75b7e5b7331222a44a848
parent6ab972be948c9abbc4f5e585fff3bf514ecf199d
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/base/backbone/backbone.cpp
trunk/src/base/backbone/backbone.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp