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

author Piotrek <ppilar11@gmail.com>

Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)

committer Piotrek <ppilar11@gmail.com>

Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)
author Piotrek <ppilar11@gmail.com>
Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)
committer Piotrek <ppilar11@gmail.com>
Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)
diff --cc src/mdictionary/gui/MainWindow.cpp
Simple merge
diff --cc src/plugins/xdxf/XdxfDialog.cpp
Simple merge
author	Piotrek <ppilar11@gmail.com>
	Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)
committer	Piotrek <ppilar11@gmail.com>
	Thu, 9 Sep 2010 13:43:41 +0000 (15:43 +0200)
		1	2
src/mdictionary/gui/MainWindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/xdxf/XdxfDialog.cpp	patch \|	diff1 \|	diff2 \|	blob \| history