Mark McDowall 5bbe310af5 Merge branch 'xem' into 'master' ... Conflicts: NzbDrone.Common/DiskProvider.cs NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs NzbDrone.Core/Providers/DiskScanProvider.cs NzbDrone.Core/Providers/DownloadProvider.cs		2012-10-20 16:07:04 -07:00
..
Datastore	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Helpers	…
Instrumentation	…
Jobs	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Model	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Properties	…
Providers	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
Repository	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
App.config	…
CentralDispatch.cs	…
Constants.cs	…
Fluent.cs	…
GettingStarted.txt	…
Json.NET.license.txt	…
NzbDrone.Core.csproj	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
NzbDrone.Core.ncrunchproject	…
NzbDrone.ico	…
NzbDrone.jpg	…
Parser.cs	…
WebTimer.cs	…
license.txt	…
packages.config	…