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

@@ -7,12 +7,16 @@
version.major=1
version.minor=4
version.revision=0
version.label=RC2 (dev)
version.label=Dev
# Edition label
version.edition=Community Network
# Build number
version.build=@build-number@
# Schema number
version.schema=14
version.schema=20