Britt Park 446343b697 Changes the behavior of submit to clobber when there are conflicts, so that ...

Preview I evaluators never get into a situation they can't get out of.


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

2006-10-09 19:53:57 +00:00

..

org/alfresco

Changes the behavior of submit to clobber when there are conflicts, so that

2006-10-09 19:53:57 +00:00

ehcache.xml

Extended Properties to batch updates. This is really a salvage

2006-07-21 08:37:05 +00:00

hibernate.cfg.xml

AVM now configures itself via Spring. Also adjusted jndi-client and catalina-virtual

2006-06-29 21:37:17 +00:00

log4j.properties

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

queryRegister.dtd

Moving to root below branch label

2005-12-08 07:13:07 +00:00