Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
author: Melanie 2013-10-06 18:32:20 +0100
committer: Melanie 2013-10-06 18:32:20 +0100
commit: 69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
tree: e46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Framework/Servers/VersionInfo.cs
parent: Merge branch 'master' into careminster (diff)
parent: * Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
download: opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.zip
opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.gz
opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.bz2
opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 737c14d..33b1366 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.6CM";
+        private const string VERSION_NUMBER = "0.8.0CM";
        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
        public enum Flavour
author	Melanie	2013-10-06 18:32:20 +0100
committer	Melanie	2013-10-06 18:32:20 +0100
commit	69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
tree	e46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Framework/Servers/VersionInfo.cs
parent	Merge branch 'master' into careminster (diff)
parent	* Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
download	opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.zip opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.gz opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.bz2 opensim-SC_OLD-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.xz

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 737c14d..33b1366 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.6CM";	32	private const string VERSION_NUMBER = "0.8.0CM";
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