<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>semancik</b></td></tr>
<tr><td>Date:</td><td>2013-01-04 13:33:56 +0100 (Fri, 04 Jan 2013)</td></tr>
<tr><td>New Revision: </td><td>4851</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Fixing a delta merging problem which also fixes projector test.<br/>
<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java?r2=4851&r1=4850"><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=4851&r1=4850"><see></a><br/>
trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java?r2=4851&r1=4850"><see></a><br/>
</div>
</body></html>