3 commits

Author	SHA1	Message	Date
Marco Pivetta	b7c28924b1	#1130 DDC-3300 - fixed inheritance maps where inheritance members were missing	2015-01-22 09:44:39 +01:00
Benjamin Eberlei	cd6131c9b8	Remove all trailing whitespaces	2011-12-19 22:56:19 +01:00
Benjamin Eberlei	f2f32ca70f	DDC-1509 - Fix regression in doMerge() introduced with the DDC-1383 bugfix	2011-11-28 10:04:33 +01:00