Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-14 16:21:55 +00:00
parent f19fa92b31
commit 1d601e1be7
29 changed files with 788 additions and 104 deletions

View File

@@ -1,4 +1,5 @@
file.jibx.binding=${dir.src.java}/org/alfresco/repo/dictionary/m2binding.xml
file.jibx.binding.m2=${dir.src.java}/org/alfresco/repo/dictionary/m2binding.xml
file.jibx.binding.systeminfo=${dir.src.java}/org/alfresco/repo/importer/system/systeminfo.xml
dir.javadoc.api.service=${dir.docs}/java-public-service-api
tck.webinf.lib.excludes=${webinf.lib.excludes},jcr-1.0.jar