Derek Hulley f24f43a98b Merged 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4295 .
   Icon changes were identical
   Manually carried changes for
      HEAD/root/projects/web-client/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
      HEAD/root/projects/web-client/source/web/WEB-INF/faces-config-navigation.xml


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

2006-12-18 14:24:16 +00:00

..

java/org/alfresco/web

Merged 1.4 to HEAD

2006-12-18 14:24:16 +00:00

meta-inf

Moving to root below branch label

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

test-resources

first pass at loading strings from resource bundles when converting the schema into an xform.

2006-12-15 02:59:47 +00:00

web

Merged 1.4 to HEAD

2006-12-18 14:24:16 +00:00