David Caruana 31db00d0e9 - fix avm submit flags (conflicts, older are ignored and overwritten) ...

- fix cosmetic issue in parallel review task (use to say it was a serial review)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4555 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-12-07 19:35:33 +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

- fix avm submit flags (conflicts, older are ignored and overwritten)

2006-12-07 19:35:33 +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