Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 12:35:52 +00:00
parent 00e6c989fc
commit 473c9ff1ff
20 changed files with 751 additions and 64 deletions

View File

@@ -24,7 +24,7 @@
<property name="jcr:primaryType">
<type>d:qname</type>
<protected>true</protected>
<mandatory>true</mandatory>
<mandatory enforced="true">true</mandatory>
</property>
<property name="jcr:mixinTypes">
<type>d:qname</type>
@@ -56,7 +56,7 @@
</source>
<target>
<class>nt:base</class>
<mandatory>true</mandatory>
<mandatory enforced="true">true</mandatory>
<many>false</many>
</target>
<child-name>jcr:content</child-name>