Kenneth Skovhede 83950e78c6 Merge branch 'feature/ignore_filenames_option' into feature/exclude_empty_folders ...

# Conflicts:
#	Duplicati/Library/Main/Operation/Backup/CountFilesHandler.cs
#	Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/TestFilterHandler.cs
#	Duplicati/Library/Main/Options.cs
#	Duplicati/Library/Main/Strings.cs

2018-04-24 14:46:46 +02:00

..

BackendUploader.cs

Updated main functions to new CoCoL library

2017-09-20 21:03:24 +02:00

BackupDatabase.cs

Merge branch 'master' into concurrent_processing

2017-05-30 00:35:31 +02:00

BackupStatsCollector.cs

Added a lot of comments.

2016-02-25 19:15:51 +01:00

Channels.cs

Updated main functions to new CoCoL library

2017-09-20 21:03:24 +02:00

CountFilesHandler.cs

Merge branch 'feature/ignore_filenames_option' into feature/exclude_empty_folders

2018-04-24 14:46:46 +02:00

DataBlock.cs

Added a lot of comments.

2016-02-25 19:15:51 +01:00

DataBlockProcessor.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

FileBlockProcessor.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

FileEnumerationProcess.cs

Merge branch 'feature/ignore_filenames_option' into feature/exclude_empty_folders

2018-04-24 14:46:46 +02:00

FilePreFilterProcess.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

MetadataGenerator.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

MetadataPreProcess.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

ProgressHandler.cs

Added a lot of comments.

2016-02-25 19:15:51 +01:00

RecreateMissingIndexFiles.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

SpillCollectorProcess.cs

Updated main functions to new CoCoL library

2017-09-20 21:03:24 +02:00

StreamBlock.cs

Merge branch 'master' into concurrent_processing

2016-10-18 13:27:36 +02:00

StreamBlockSplitter.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

UploadRealFilelist.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00

UploadSyntheticFilelist.cs

Merge branch 'master' into concurrent_processing

2018-04-11 23:02:47 +02:00