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/Region/RegionCombinerModule/Properties
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/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index 86a3101..c341dfd 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/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	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/Region/RegionCombinerModule/Properties
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/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs index 86a3101..c341dfd 100644 --- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/RegionCombinerModule/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