<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-19 20:48:25 +0100 (Tue, 19 Feb 2013)</td></tr>
<tr><td>New Revision: </td><td>5116</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Merge all from trunk at 5115<br/>
</div><hr/>
<b>Added:</b><div style='padding-left: 20px; color:green'>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/disabled.png <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/disabled.png?r=5116"><see></a><br/>
branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-import.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-import.xml?r=5116"><see></a><br/>
branches/wicket6/samples/resources/csvfile/role-csvfile-import.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/role-csvfile-import.xml?r=5116"><see></a><br/>
branches/wicket6/tools/gotcha.pl <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/tools/gotcha.pl?r=5116"><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=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.css <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.css?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.js <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/threeStateCheckBox/ThreeStateCheckBox.js?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/sample-configurations/sqlserver.properties <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/sample-configurations/sqlserver.properties?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java?r2=5116&r1=5115"><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=5116&r1=5115"><see></a><br/>
branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java?r2=5116&r1=5115"><see></a><br/>
branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/branches/wicket6/samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml?r2=5116&r1=5115"><see></a><br/>
</div>
</body></html>