aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-08-31 00:10:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-08-31 00:10:12 -0400
commit42712d42aa123e54ef577dd6ad85792b1130fb05 (patch)
tree2de93381daebc27d4ca4f11de8ef13b9814e9383
parent2811e5c317f1b6284616f9ce91de6455ec794893 (diff)
parenteac2817a97770021ee24e3e2b4c0e48d2d085067 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
-rw-r--r--MediaBrowser.Server.Mac/Emby.Server.Mac.csproj5
1 files changed, 1 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index f84388cec..b2d812434 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -8,7 +8,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>MediaBrowser.Server.Mac</RootNamespace>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
- <AssemblyName>MediaBrowser.Server.Mac</AssemblyName>
+ <AssemblyName>Emby.Server.Mac</AssemblyName>
<ApplicationIcon>..\MediaBrowser.WebDashboard\dashboard-ui\css\images\favicon.ico</ApplicationIcon>
<ReleaseVersion>
</ReleaseVersion>
@@ -3250,9 +3250,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
<Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\pluginupdates.css">
- <Link>Resources\dashboard-ui\css\pluginupdates.css</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\remotecontrol.css">
<Link>Resources\dashboard-ui\css\remotecontrol.css</Link>
</BundleResource>