diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-03-27 23:39:00 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-03-27 23:39:00 -0400 |
| commit | ca2062c7537b70793f923e9c4ba07009e29f4349 (patch) | |
| tree | 7836ea3aa5abf461c8c674f096cd0f0973eeb1b5 | |
| parent | 38d19d4c8092467290e3c1cd49822d7d273e2733 (diff) | |
| parent | fe482f3ac352b68375797ad6c1353969ea55e980 (diff) | |
Merge pull request #1608 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index c48f609ae..33df83b2f 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac return list; } - public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory) + public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory) { } diff --git a/SharedVersion.cs b/SharedVersion.cs index f2ac1e3a3..f6c35210c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5910")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5911")] |