aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorDiva Canto2015-10-18 21:47:10 -0700
committerDiva Canto2015-10-18 21:51:49 -0700
commit59b63b64066d9da706c47e47bddd86a897ccd175 (patch)
treed288f5554f4e25cf5bfd0527083c888a847eda69 /OpenSim/Framework/Servers
parentAdded warning in RegionCombinerModule about it being considered obsolete and ... (diff)
downloadopensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.zip
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.gz
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.bz2
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.xz
On to 0.8.3!
Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 63335bd..5e630dc 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/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.8.2.*")] 32[assembly: AssemblyVersion("0.8.3.*")]
33 33