Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -43,15 +43,15 @@
<cm:folder>
<cm:name>L0- Folder C</cm:name>
<cm:contains>
<!-- L1 files -->
<!-- L1 files -->
<cm:content>
<cm:name>DUPLICATE</cm:name>
<cm:name>CHECK_FILE</cm:name>
<cm:content>contentUrl=classpath:quick/quick.txt|mimetype=text/plain|size=|encoding=</cm:content>
</cm:content>
<!-- L2 folders -->
<cm:folder>
<cm:name>DUPLICATE</cm:name>
</cm:folder>
<!-- L2 folders -->
<cm:folder>
<cm:name>CHECK_FOLDER</cm:name>
</cm:folder>
</cm:contains>
</cm:folder>