aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Kernel
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-31 12:29:07 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-31 12:29:07 -0400
commitdefd8ed253a1e47d0951d6e0abf850129f776327 (patch)
treed2ee50baeb07d38bc5d8dafa0a725cd377cf99c1 /MediaBrowser.Common/Kernel
parent3058b71764bd2775fedbb7f71342b497134f6c86 (diff)
Added an ApiInteraction project that UI's can use to talk to the server. Moved jsonserializer namespace from json to serialization, since we may be adding an xml serializer.
Diffstat (limited to 'MediaBrowser.Common/Kernel')
-rw-r--r--MediaBrowser.Common/Kernel/BaseKernel.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 0fdc1f8131..cc3cb76f08 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -10,8 +10,8 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Logging;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Serialization;
using MediaBrowser.Model.Progress;
-using MediaBrowser.Common.Json;
namespace MediaBrowser.Common.Kernel
{
@@ -93,8 +93,6 @@ namespace MediaBrowser.Common.Kernel
public virtual void Init(IProgress<TaskProgress> progress)
{
- JsonSerializer.Configure();
-
ReloadLogger();
ReloadConfiguration();