diff options
| author | T. Adams <t.adams88@gmail.com> | 2015-03-13 21:57:10 -0700 |
|---|---|---|
| committer | T. Adams <t.adams88@gmail.com> | 2015-03-13 21:57:10 -0700 |
| commit | eff23da3737718c944a59078c24e3ccf19435b90 (patch) | |
| tree | 68d1c42e2bcd4a4be0398c8f4c0f1ba88d42e56e /MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | |
| parent | b7b28ffd31892dac13004199766262126d2785c5 (diff) | |
| parent | dbb7fd61ff0545f8ebf7b9ece432f1408d43040c (diff) | |
Merge branch 'dev' into Video-Playlist-Controls
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 6292defc15..396d378bcd 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -248,6 +248,7 @@ <Compile Include="Persistence\TypeMapper.cs" /> <Compile Include="Photos\BaseDynamicImageProvider.cs" /> <Compile Include="Photos\DynamicImageHelpers.cs" /> + <Compile Include="Photos\StripCollageBuilder.cs" /> <Compile Include="Playlists\ManualPlaylistsFolder.cs" /> <Compile Include="Photos\PhotoAlbumImageProvider.cs" /> <Compile Include="Playlists\PlaylistImageProvider.cs" /> @@ -428,6 +429,7 @@ <EmbeddedResource Include="Localization\Server\uk.json" /> <EmbeddedResource Include="Drawing\fonts\webdings.ttf" /> <EmbeddedResource Include="Drawing\fonts\robotoregular.ttf" /> + <EmbeddedResource Include="Drawing\fonts\MontserratLight.otf" /> <None Include="Localization\JavaScript\sl_SI.json" /> <EmbeddedResource Include="Localization\Server\sl_SI.json" /> <None Include="packages.config" /> |