Kenneth Skovhede b77499f8e2 Merge branch 'master' into feature/windows_service ...

# Conflicts:
#	Duplicati.sln
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj

2016-04-13 11:46:49 +02:00

..

Properties

Updated copyright notices

2015-01-20 21:44:52 +01:00

app.config

Added missing app.config files

2015-03-06 14:02:31 +01:00

Duplicati.Service.csproj

Reverted changes to solution file so it again forces Windows linefeeds.

2016-04-13 00:36:22 +02:00

Program.cs

Added a windows service

2016-04-13 11:44:21 +02:00

Runner.cs

Added a windows service

2016-04-13 11:44:21 +02:00