Merge branch 'master' into varregion

author: Robert Adams 2013-10-07 13:58:17 -0700
committer: Robert Adams 2013-10-07 13:58:17 -0700
commit: 86bf79aa2b60ab33042fc078a177ad3cdaa62e01 (patch)
tree: a123b39f20170798a74edf3009aaf6235e003a46 /OpenSim/Framework/Servers/VersionInfo.cs
parent: varregion: plug in TerrainData class and modify TerrainModule and LLClientVie... (diff)
parent: * Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
download: opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.zip
opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.gz
opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.bz2
opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 80568e0..98c19b9 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.7.6";
+        private const string VERSION_NUMBER = "0.8.0";
        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
        public enum Flavour
author	Robert Adams	2013-10-07 13:58:17 -0700
committer	Robert Adams	2013-10-07 13:58:17 -0700
commit	86bf79aa2b60ab33042fc078a177ad3cdaa62e01 (patch)
tree	a123b39f20170798a74edf3009aaf6235e003a46 /OpenSim/Framework/Servers/VersionInfo.cs
parent	varregion: plug in TerrainData class and modify TerrainModule and LLClientVie... (diff)
parent	* Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
download	opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.zip opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.gz opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.bz2 opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.xz

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 80568e0..98c19b9 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.7.6";	32	private const string VERSION_NUMBER = "0.8.0";
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