Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-09-02 18:19:00 +00:00
parent db3c29b45e
commit 820da6ecab
147 changed files with 9873 additions and 1289 deletions

View File

@@ -7,7 +7,7 @@
version.major=1
version.minor=4
version.revision=0
version.label=Dev
version.label=Preview
# Edition label
@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
version.schema=20
version.schema=21