merge changes from branch to trunk

author Frederik Gladhorn <gladhorn@kde.org>

Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)

committer Frederik Gladhorn <gladhorn@kde.org>

Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)
author Frederik Gladhorn <gladhorn@kde.org>
Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)
committer Frederik Gladhorn <gladhorn@kde.org>
Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)
diff --cc keduvocdocument/keduvoccontainer.cpp
Simple merge
diff --cc keduvocdocument/keduvockvtml2writer.cpp
Simple merge
author	Frederik Gladhorn <gladhorn@kde.org>
	Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)
committer	Frederik Gladhorn <gladhorn@kde.org>
	Tue, 13 Apr 2010 15:27:28 +0000 (15:27 +0000)
		1	2
keduvocdocument/keduvoccontainer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
keduvocdocument/keduvockvtml2writer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history