diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-27 11:57:14 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-27 11:57:14 -0500 |
| commit | 6d5d291762c050e0f5598f45b837e45f270d600f (patch) | |
| tree | bb6d6fe204d7e9c8b6a9502b2604202cc7849c92 /MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj | |
| parent | ca7ee684730fe0d99a6160659c679c36a1646c88 (diff) | |
| parent | 1d51ede06056a54099616d0f52fdf8150c510e50 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
MediaBrowser.ServerApplication/ApplicationHost.cs
Diffstat (limited to 'MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj')
| -rw-r--r-- | MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 70d92edb5..a8dfe33cf 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -129,6 +129,7 @@ <Compile Include="ServerManager\ServerManager.cs" /> <Compile Include="ServerManager\WebSocketConnection.cs" /> <Compile Include="Udp\UdpServer.cs" /> + <Compile Include="Updates\PackageManager.cs" /> <Compile Include="WebSocket\AlchemyServer.cs" /> <Compile Include="WebSocket\AlchemyWebSocket.cs" /> </ItemGroup> @@ -163,9 +164,7 @@ <Content Include="swagger-ui\swagger-ui.js" /> <Content Include="swagger-ui\swagger-ui.min.js" /> </ItemGroup> - <ItemGroup> - <Folder Include="Updates\" /> - </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <PropertyGroup> |