svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root

svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-04-12 14:58:21 +00:00
parent c3adde8ac4
commit 776314da72
17 changed files with 469 additions and 63 deletions

View File

@@ -46,9 +46,10 @@
<mandatory enforced="true">true</mandatory>
<default>0</default>
</property>
<property name="sys:license">
<type>d:content</type>
</property>
<property name="sys:versionEdition">
<type>d:any</type>
<multiple>true</multiple>
</property>
</properties>
</type>