Britt Park a5bd362e24 This allows missing nodes to override existing nodes during an update. It ...

should allow reverts to work correctly in all circumstances.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-11-22 19:10:17 +00:00

..

cpp/CAlfrescoApp

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

java

This allows missing nodes to override existing nodes during an update. It

2006-11-22 19:10:17 +00:00

test-resources

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

web/WEB-INF

- Incorporate JCR project into Repository project

2006-05-05 16:33:22 +00:00