You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		12 years ago
..
ConfigFileProviderTest.cs	…
DiskProviderFixture.cs	…
EnviromentProviderTest.cs	…
License.txt	…
NzbDrone.Common.Test.csproj	…
NzbDrone.Common.Test.ncrunchproject	…
PathExtentionFixture.cs	…
ProcessProviderTests.cs	…
ReflectionExtensions.cs	…
ReportingService_ReportParseError_Fixture.cs	…
ServiceProviderTests.cs	…
WebClientTests.cs	…
packages.config	…