inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
   svn resolved root\projects\3rd-party\.classpath
   svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
   svn resolved root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 14:24:45 +00:00
parent 473c9ff1ff
commit cfb373ae36
17 changed files with 473 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/bootstrap/categories.xml
View File

@@ -882,7 +882,7 @@
<cm:name>Saint Lucia</cm:name>
</cm:category>
<cm:category>
<cm:name>Saint Vincent and Grenadines.</cm:name>
<cm:name>Saint Vincent and Grenadines</cm:name>
</cm:category>
<cm:category>
<cm:name>Trinidad and Tobago</cm:name>
@@ -891,7 +891,7 @@
<cm:name>Turks and Caicos Islands</cm:name>
</cm:category>
<cm:category>
<cm:name>United States Virgin Islands.</cm:name>
<cm:name>United States Virgin Islands</cm:name>
</cm:category>
</cm:subcategories>
</cm:category>