Alan Davis 12769c2923 Merged 5.2.N (5.2.1) to HEAD (5.2) ...

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


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

2016-06-03 16:45:04 +00:00

..

desk

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

rules

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

AlfrescoFolder.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

BufferedContentDiskDriver.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

BufferedWrite.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

CacheLookupSearchContext.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

CIFSContentComparator.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

CifsHelper.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ClientHelper.java

ALF-16257: CIFS: Collaborator/editor could not edit file on Mac Os Mountain Lion

2013-09-09 12:41:13 +00:00

CommandExecutor.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

CommandExecutorImpl.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

ContentComparator.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

ContentContext.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentDiskCallback.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

ContentDiskDriver2.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

ContentDiskDriver.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentDiskInterface.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentFileInfo.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentIOControlHandler.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentQuotaManager.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

ContentSearchContext.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

CreateNodeEvent.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

DeleteNodeEvent.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

DotDotContentSearchContext.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

FilesystemTransactionAdvice.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

InFlightCorrectable.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

InFlightCorrector.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

InFlightCorrectorImpl.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

LegacyFileStateDriver.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

LinkMemoryNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

LockKeeper.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

LockKeeperImpl.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

LockKeeperRefreshJob.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

LockNodeEvent.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

MoveNodeEvent.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

MSOfficeContentNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NodeEvent.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NodeEventQueue.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NodeMonitor.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NodeMonitorFactory.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NodeRefNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

NonTransactionalRuleContentDiskDriver.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

OpenFileMode.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

OpenOfficeContentNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00

package-info.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

ResultCallback.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

TempNetworkFile.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:45:04 +00:00

UserQuotaDetails.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-06-03 16:40:56 +00:00