diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-14 15:01:57 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-12-14 15:01:57 -0500 |
| commit | ed31b883f4bf1884ee974171501e61f83c768379 (patch) | |
| tree | 9f09e1c6723c515cfc7d2608f0e0aa7226372c7d | |
| parent | 1c1336ac084848d43f57e2b57a0568f78c278a2d (diff) | |
| parent | e490223ebca73e2172f9117aee31c3fd6af6b20d (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 0860d5b86..c5d420d13 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -301,9 +301,6 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardgeneral.html">
<Link>Resources\dashboard-ui\dashboardgeneral.html</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboardsync.html">
- <Link>Resources\dashboard-ui\dashboardsync.html</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\device.html">
<Link>Resources\dashboard-ui\device.html</Link>
</BundleResource>
@@ -571,6 +568,12 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\supporterkey.html">
<Link>Resources\dashboard-ui\supporterkey.html</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\syncactivity.html">
+ <Link>Resources\dashboard-ui\syncactivity.html</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\syncsettings.html">
+ <Link>Resources\dashboard-ui\syncsettings.html</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\tvgenres.html">
<Link>Resources\dashboard-ui\tvgenres.html</Link>
</BundleResource>
@@ -1216,9 +1219,6 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardpage.js">
<Link>Resources\dashboard-ui\scripts\dashboardpage.js</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\dashboardsync.js">
- <Link>Resources\dashboard-ui\scripts\dashboardsync.js</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\device.js">
<Link>Resources\dashboard-ui\scripts\device.js</Link>
</BundleResource>
@@ -1537,6 +1537,12 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\sync.js">
<Link>Resources\dashboard-ui\scripts\sync.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\syncactivity.js">
+ <Link>Resources\dashboard-ui\scripts\syncactivity.js</Link>
+ </BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\syncsettings.js">
+ <Link>Resources\dashboard-ui\scripts\syncsettings.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\thememediaplayer.js">
<Link>Resources\dashboard-ui\scripts\thememediaplayer.js</Link>
</BundleResource>
|