alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-26 17:40:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source 
Conflicts:
	MediaBrowser.Common/Kernel/ResourcePool.cs
This commit is contained in:
LukePulverenti
2013-03-04 00:44:04 -05:00
parent 2ca4b7d03a dccba7d1fd
commit a11e00b8d5
8 changed files with 302 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -108,6 +108,8 @@
<Compile Include="IServerApplicationPaths.cs" />
<Compile Include="Library\ChildrenChangedEventArgs.cs" />
<Compile Include="Library\DtoBuilder.cs" />
<Compile Include="Providers\Music\LastfmArtistProvider.cs" />
<Compile Include="Providers\Music\LastfmBaseArtistProvider.cs" />
<Compile Include="Resolvers\BaseItemResolver.cs" />
<Compile Include="Resolvers\BaseVideoResolver.cs" />
<Compile Include="Resolvers\IItemResolver.cs" />