<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>mederly</b></td></tr>
<tr><td>Date:</td><td>2013-06-26 23:31:03 +0200 (Wed, 26 Jun 2013)</td></tr>
<tr><td>New Revision: </td><td>6004</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Fixed duplicate "add" values when merging ADD with MODIFY delta.<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java?r2=6004&r1=6003"><see></a><br/>
trunk/infra/prism/src/main/resources/xml/ns/test/foo-1.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/resources/xml/ns/test/foo-1.xsd?r2=6004&r1=6003"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java?r2=6004&r1=6003"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java?r2=6004&r1=6003"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java?r2=6004&r1=6003"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectType.java?r2=6004&r1=6003"><see></a><br/>
</div>
</body></html>