tree b68701a23f698c3aeb6a23d0e272e2460e31c921
parent 729481ce247f8ac29efb375ae879e4a9fed2e451
author martin f. krafft <madduck@madduck.net> 1372015638 +0200
committer martin f. krafft <madduck@madduck.net> 1372070192 +0200

Fix merging of parameters

The merging logic was wrong, inverting the behaviour of parameter
merging, somewhat anyway.

This is now fixed. Entities are collected in a list, and then the list
is reduced through merging the second element into the first. The entity
of the current level is only merged once, at the very end.

Signed-off-by: martin f. krafft <madduck@madduck.net>