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/Region/ScriptEngine/Shared/Instance
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/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
index 48964b6..815d11b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.8.0.*")]
author	Melanie	2013-10-06 18:32:20 +0100
committer	Melanie	2013-10-06 18:32:20 +0100
commit	69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
tree	e46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Region/ScriptEngine/Shared/Instance
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/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs index 48964b6..815d11b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
29	// Build Number	29	// Build Number
30	// Revision	30	// Revision
31	//	31	//
32	[assembly: AssemblyVersion("0.7.6.*")]	32	[assembly: AssemblyVersion("0.8.0.*")]
33		33