diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-25 22:43:56 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-25 22:43:56 -0500 |
| commit | efdb2f3990f6a5250949b7a86bbd83def876f612 (patch) | |
| tree | d4c7df1c5f159e5a544ebf0b168f18cb302a7712 /MediaBrowser.WebDashboard | |
| parent | 2d06095447b972c8c7239277428e2c67c8b7ca86 (diff) | |
| parent | 59ce9444786c4cb3a4eac23f4d26c537a9983c8f (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
Nuget/MediaBrowser.ApiClient.nuspec
Diffstat (limited to 'MediaBrowser.WebDashboard')
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/Readme.txt | 4 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.WebDashboard/Html/Readme.txt b/MediaBrowser.WebDashboard/Html/Readme.txt new file mode 100644 index 0000000000..c47c075416 --- /dev/null +++ b/MediaBrowser.WebDashboard/Html/Readme.txt @@ -0,0 +1,4 @@ +All static files such as html, images, etc, need to be marked as embedded resources.
+
+Here is a link for more information regarding the Build Action property.
+http://msdn.microsoft.com/en-us/library/0c6xyb66.aspx
\ No newline at end of file diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index a65a2afebb..05d3071688 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -384,6 +384,7 @@ <EmbeddedResource Include="Html\scripts\ItemDetailPage.js" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Html\Readme.txt" />
<EmbeddedResource Include="Html\css\images\media\playCircle.png" />
<EmbeddedResource Include="Html\css\images\media\nextTrack.png" />
<EmbeddedResource Include="Html\css\images\media\pause.png" />
|