From 52dc9ec0038052f139c759ce15df08361be96666 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Nov 2009 19:00:57 +0000
Subject: Bump trunk version number to 0.6.9. This is a place holder name and
 not necessarily the version number that will be used

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 9f98310..ec94b2d 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.8";
+        private const string VERSION_NUMBER = "0.6.9";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-- 
cgit v1.1


From 251fd8c948a141fe898f0df025c2be764d39d4d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Nov 2009 18:24:21 +0000
Subject: Apply patch to reduce git revision text length if running sim
 directly from a git tree See http://opensimulator.org/mantis/view.php?id=4030
 Thanks ChrisDown (and Bruce for reporting)

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 0d93ff7..655df9d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -442,7 +442,7 @@ namespace OpenSim.Framework.Servers
             if (File.Exists(gitCommitFileName))
             {
                 StreamReader CommitFile = File.OpenText(gitCommitFileName);
-                buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine();
+                buildVersion = CommitFile.ReadLine();
                 CommitFile.Close();
                 m_version += buildVersion ?? "";
             }
-- 
cgit v1.1