Sonarr/NzbDrone.Core.Test/ProviderTests/DecisionEngineTests
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
..
AcceptableSizeSpecificationFixture.cs
AllowedDownloadSpecificationFixture.cs
AllowedReleaseGroupSpecificationFixture.cs
CustomStartDateSpecificationFixture.cs Merge branch 'xem' into 'master' 2012-10-20 16:07:04 -07:00
MonitoredEpisodeSpecificationFixture.cs
QualityAllowedByProfileSpecificationFixtrue.cs
QualityUpgradeSpecificationFixture.cs
RetentionSpecificationFixture.cs
UpgradeDiskSpecificationFixtrue.cs Merge branch 'xem' into 'master' 2012-10-20 16:07:04 -07:00
UpgradeHistorySpecificationFixtrue.cs Merge branch 'xem' into 'master' 2012-10-20 16:07:04 -07:00
UpgradePossibleSpecificationFixture.cs