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
..
AcceptableSizeSpecification.cs	QualityTypes no longer an enum	2012-10-13 17:36:16 -07:00
AllowedDownloadSpecification.cs	Renamed AiredAfter to CustomStartDate	2012-09-20 08:37:40 -07:00
AllowedReleaseGroupSpecification.cs	…
AlreadyInQueueSpecification.cs	…
CustomStartDateSpecification.cs	Fixed: Issues with Custom Start Date	2012-10-18 11:50:52 -07:00
MonitoredEpisodeSpecification.cs	Cleanup and updates for XEM	2012-10-17 00:39:06 -07:00
QualityAllowedByProfileSpecification.cs	QualityTypes no longer an enum	2012-10-13 17:36:16 -07:00
QualityUpgradeSpecification.cs	QualityTypes no longer an enum	2012-10-13 17:36:16 -07:00
RetentionSpecification.cs	…
UpgradeDiskSpecification.cs	Merge branch 'xem' into 'master'	2012-10-20 16:07:04 -07:00
UpgradeHistorySpecification.cs	Cleanup and updates for XEM	2012-10-17 00:39:06 -07:00
UpgradePossibleSpecification.cs	…