<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>lazyman</b></td></tr>
<tr><td>Date:</td><td>2013-01-26 11:26:53 +0100 (Sat, 26 Jan 2013)</td></tr>
<tr><td>New Revision: </td><td>4949</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 4948<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/dbsupport/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/prism/src/main/resources/xml/ns/public/types-2.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/prism/src/main/resources/xml/ns/public/types-2.xsd?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java?r2=4949&r1=4948"><see></a><br/>
branches/dbsupport/samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/dbsupport/samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java?r2=4949&r1=4948"><see></a><br/>
</div>
</body></html>