LukePulverenti a11e00b8d5 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser ... Conflicts: MediaBrowser.Common/Kernel/ResourcePool.cs		2013-03-04 00:44:04 -05:00
..
BaseKernel.cs	Created IConfigurationManager	2013-03-04 00:43:06 -05:00
BasePeriodicWebSocketListener.cs	added a shutdown api method, font size fix and other decouplings	2013-02-26 11:10:55 -05:00
IKernel.cs	Created IConfigurationManager	2013-03-04 00:43:06 -05:00
IServerManager.cs	fixed the plugin catalog not loading	2013-02-27 11:46:48 -05:00
IWebSocketListener.cs	extracted more interfaces	2013-02-22 19:44:20 -05:00
KernelContext.cs	Pushing missing changes	2013-02-20 20:33:05 -05:00
ResourcePool.cs	Created IConfigurationManager	2013-03-04 00:43:06 -05:00