Merge
This commit is contained in:
commit
3dda1cfdbc
|
@ -10,6 +10,7 @@
|
||||||
<RootNamespace>MediaBrowser.Common</RootNamespace>
|
<RootNamespace>MediaBrowser.Common</RootNamespace>
|
||||||
<AssemblyName>MediaBrowser.Common</AssemblyName>
|
<AssemblyName>MediaBrowser.Common</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user