aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-12 22:10:51 -0400
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-12 22:10:51 -0400
commit1a28d9317217d646ca0a2f57229fcbce42c5203d (patch)
treed9590c59b8de9de122ef4b873c09af0266f54254
parent9afd1741e0bf69cdf6c7a62679dcb70638278ab9 (diff)
parent89f18c83c89b6f46419a425e20e2b8e8b14dd606 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.Installer/MediaBrowser.Installer.csproj2
-rw-r--r--MediaBrowser.sln3
2 files changed, 1 insertions, 4 deletions
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index 0108f5c7c..f27225749 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -31,7 +31,7 @@
<PublisherName>Media Browser Team</PublisherName>
<SuiteName>Media Browser</SuiteName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
- <ApplicationRevision>40</ApplicationRevision>
+ <ApplicationRevision>42</ApplicationRevision>
<ApplicationVersion>0.1.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index c13ad6f81..16caa617d 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -237,7 +237,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(Performance) = preSolution
- HasPerformanceSessions = true
- EndGlobalSection
EndGlobal