ebr11 Eric Reed spam 9fbd88a713 fix up some merge errors

2012-09-17 16:53:39 -04:00

..

Entities

Merge with default

2012-09-17 16:24:01 -04:00

FFMpeg

Updated ffmpeg

2012-09-16 11:12:28 -04:00

IO

fix up some merge errors

2012-09-17 16:53:39 -04:00

Library

Merge with default

2012-09-17 16:24:01 -04:00

Properties

Some minor code cleanups

2012-09-11 14:20:12 -04:00

Providers

Improved episode image discovery

2012-09-16 11:16:49 -04:00

Resolvers

fix up some merge errors

2012-09-17 16:53:39 -04:00

Weather

Made WeatherClient disposable

2012-09-16 19:11:55 -04:00

Xml

Some minor code cleanups

2012-09-11 14:20:12 -04:00

Kernel.cs

fix up some merge errors

2012-09-17 16:53:39 -04:00

MediaBrowser.Controller.csproj

Initial commit changing to on-demand child loading and validations

2012-09-17 11:12:43 -04:00

packages.config

Made a separate ApiInteraction solution with platform-specific builds

2012-09-05 19:40:44 -04:00

ServerApplicationPaths.cs

Some minor code cleanups

2012-09-11 14:20:12 -04:00