diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-04-21 19:53:00 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-04-21 19:53:00 +0200 |
| commit | 1cd83cc39519d939a1bc2c994215753331d4a650 (patch) | |
| tree | 003f590dc52f63b59e095879849e812660eac31a | |
| parent | 207410047fe2c0775a33f234a0587308f3d1cc8c (diff) | |
| parent | 4a6bd9eb7591c519c5e0d2c6d5372e4ab4ba7c9f (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 43e0c7307..0d545fb6a 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -67,9 +67,9 @@ <Reference Include="ServiceStack.Api.Swagger"> <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath> </Reference> - <Reference Include="SocketHttpListener, Version=1.0.5589.19341, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="SocketHttpListener, Version=1.0.5589.21083, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\SocketHttpListener.1.0.0.5\lib\net45\SocketHttpListener.dll</HintPath> + <HintPath>..\packages\SocketHttpListener.1.0.0.6\lib\net45\SocketHttpListener.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> diff --git a/SharedVersion.cs b/SharedVersion.cs index 49945f62a..f4ee55b0b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5588.0")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5588.0")] |