aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorMelanie2013-10-06 18:32:20 +0100
committerMelanie2013-10-06 18:32:20 +0100
commit69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
treee46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Capabilities
parentMerge branch 'master' into careminster (diff)
parent* Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
downloadopensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.zip
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.gz
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.bz2
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
index f8f63f4..0cf8bf4 100644
--- a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Handlers/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