From 2a482c22bcbfbda043e050414ea19f33ce3e079d Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 13 Feb 2014 00:22:47 +0000 Subject: [PATCH 1/2] Reassert extended branch version flavour again after merge from 0.7.6-post-fixes --- OpenSim/Framework/Servers/VersionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 8f77f68e56..8c7db924a5 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs @@ -30,7 +30,7 @@ namespace OpenSim public class VersionInfo { private const string VERSION_NUMBER = "0.7.6.1"; - private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes; + private const Flavour VERSION_FLAVOUR = Flavour.Extended; public enum Flavour { From d81a1666dafdf3bebb103eec9121b22e484263d0 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Thu, 13 Feb 2014 00:23:51 +0000 Subject: [PATCH 2/2] Revert "Reassert extended branch version flavour again after merge from 0.7.6-post-fixes" This reverts commit 2a482c22bcbfbda043e050414ea19f33ce3e079d. --- OpenSim/Framework/Servers/VersionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 8c7db924a5..8f77f68e56 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs @@ -30,7 +30,7 @@ namespace OpenSim public class VersionInfo { private const string VERSION_NUMBER = "0.7.6.1"; - private const Flavour VERSION_FLAVOUR = Flavour.Extended; + private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes; public enum Flavour {