<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-02-21 00:06:16 +0100 (Thu, 21 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5126</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5125<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/infra/prism/src/test/resources/schema/weapons.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/resources/schema/weapons.xsd?r=5126"><see></a><br/>
</div>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
branches/wicket6/ <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/main/resources/xml/ns/test/foo-1.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/main/resources/xml/ns/test/foo-1.xsd?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismSchemaConstruction.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismSchemaConstruction.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/prism/src/test/resources/schema/extension.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/prism/src/test/resources/schema/extension.xsd?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/model/model-intest/testng.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-intest/testng.xml?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java?r2=5126&r1=5125"><see></a><br/>
branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java?r2=5126&r1=5125"><see></a><br/>
</div>
</body></html>