Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into xdxf

author Jakub Jaszczynski <j.j.jaszczynski@gmail.com>

Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)

committer Jakub Jaszczynski <j.j.jaszczynski@gmail.com>

Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
author Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
committer Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
diff --cc trunk/src/includes/CommonDictInterface.h
Simple merge
diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
Simple merge
author	Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
	Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
committer	Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
	Thu, 5 Aug 2010 09:57:40 +0000 (11:57 +0200)
		1	2
trunk/src/includes/CommonDictInterface.h	patch \|	diff1 \|	diff2 \|	blob \| history
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history