Mark McDowall a290a0dcb0 Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core/Providers/Jobs/EpisodeSearchJob.cs NzbDrone.Core/Providers/SeriesProvider.cs		2011-06-13 19:23:43 -07:00
..
DeleteSeriesJob.cs
DiskScanJob.cs
EpisodeSearchJob.cs	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-06-13 19:23:43 -07:00
IJob.cs
ImportNewSeriesJob.cs
JobProvider.cs
PostDownloadScanJob.cs
RenameEpisodeJob.cs
RssSyncJob.cs
UpdateInfoJob.cs
UpdateSceneMappingsJob.cs	SceneNaming is now stored on NzbDrone webserver.	2011-06-13 19:15:55 -07:00