Kenneth Skovhede 9c5183f794 Merge branch 'master' into sandboxes/Kenneth/ForestHash ...

Conflicts:
	Duplicati.sln
	Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
	Duplicati/CommandLine/Decrypter/Duplicati.CommandLine.Decrypter.csproj
	Duplicati/CommandLine/Duplicati.CommandLine.csproj
	Duplicati/GUI/Datamodel/Datamodel.csproj
	Duplicati/GUI/Duplicati.GUI.MacTrayIcon/Duplicati.GUI.MacTrayIcon.csproj
	Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
	Duplicati/GUI/Duplicati.csproj
	Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj
	Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
	Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
	Duplicati/Library/Backend/GoogleDocs/Duplicati.Library.Backend.GoogleDocs.csproj
	Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
	Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj
	Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
	Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
	Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
	Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj
	Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
	Duplicati/Library/Interface/Duplicati.Library.Interface.csproj
	Duplicati/Library/Logging/Duplicati.Library.Logging.csproj
	Duplicati/Library/Main/Duplicati.Library.Main.csproj
	Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
	Duplicati/Library/SharpRSync/Duplicati.Library.SharpRSync.csproj
	Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj
	Duplicati/Library/Utility/Duplicati.Library.Utility.csproj
	Duplicati/License/Duplicati.License.csproj
	Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
	Duplicati/Server/Duplicati.Server.csproj
	Duplicati/Winforms/Controls/Duplicati.Winforms.Controls.csproj
	WizardForm/WizardForm.csproj

2013-05-05 13:55:18 +02:00

..

Properties

Initial version of the new block-based storage format.

2013-02-12 21:43:14 +00:00

Strings

Initial version of the new block-based storage format.

2013-02-12 21:43:14 +00:00

app.config

Initial version of the new block-based storage format.

2013-02-12 21:43:14 +00:00

Duplicati.Library.Compression.csproj

Removed unused x86 configurations and fixes som build refrences

2013-05-05 13:45:02 +02:00

Duplicati.snk

Initial version of the new block-based storage format.

2013-02-12 21:43:14 +00:00

FileArchiveDirectory.cs

More work on the block hash.

2013-03-08 22:24:54 +01:00

FileArchiveZip.cs

Improved access speed to zip-based archives

2013-04-09 21:37:44 +02:00

StreamWrapper.cs

Initial version of the new block-based storage format.

2013-02-12 21:43:14 +00:00