Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorPiotrek <ppilar11@gmail.com>
Mon, 30 Aug 2010 07:44:00 +0000 (09:44 +0200)
committerPiotrek <ppilar11@gmail.com>
Mon, 30 Aug 2010 07:44:00 +0000 (09:44 +0200)
commitbf4fc5ff9924452dcf9ab4eaefa943d79ad11074
tree17938d758bbbe47941079af6278c3b99d376ab65
parent204900635e718910def1d6c74be679c202633ab1
parent92db990e531a31cf1986f3cb16ad6f95d357f138
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
trunk/src/plugins/xdxf/tests/test.cpp
trunk/src/plugins/xdxf/tests/test.h
trunk/src/includes/CommonDictInterface.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/tests/test.cpp
trunk/src/plugins/xdxf/tests/test.h