Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim

author: dahlia 2009-11-30 01:09:46 -0800
committer: dahlia 2009-11-30 01:09:46 -0800
commit: 5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree: 75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Framework/Servers/VersionInfo.cs
parent: add agent position to output of "show users" console command (diff)
parent: * Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download: opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz
1 files changed, 1 insertions, 1 deletions
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
author	dahlia	2009-11-30 01:09:46 -0800
committer	dahlia	2009-11-30 01:09:46 -0800
commit	5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree	75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Framework/Servers/VersionInfo.cs
parent	add agent position to output of "show users" console command (diff)
parent	* Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download	opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2 opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz

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
29	{	29	{
30	public class VersionInfo	30	public class VersionInfo
31	{	31	{
32	private const string VERSION_NUMBER = "0.6.8";	32	private const string VERSION_NUMBER = "0.6.9";
33	private const Flavour VERSION_FLAVOUR = Flavour.Dev;	33	private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34		34
35	public enum Flavour	35	public enum Flavour