Mark McDowall 67299f0d97 Merge branch 'master' of git://github.com/kayone/NzbDrone ... Conflicts: NzbDrone.Core.Test/NzbDrone.Core.Test.csproj		2011-07-09 19:48:02 -07:00
..
Content	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Controllers	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Helpers	…
Models	XbmcProvider updated to include new Json API methods.	2011-07-09 11:19:33 -07:00
Properties	…
Scripts	…
Views	Merge branch 'master' of git://github.com/kayone/NzbDrone	2011-07-09 19:48:02 -07:00
Global.asax	…
Global.asax.cs	…
NzbDrone.Web.csproj	…
Web.Debug.config	…
Web.Release.config	…
Web.config	…
favicon.ico	…
log.config	…
packages.config	…