diff options
| 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/AssemblyInfo.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Added a unique and interesting WebSocket grid login processor by hijacking ... (diff) | |
| download | opensim-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/Framework/AssemblyInfo.cs')
| -rw-r--r-- | OpenSim/Framework/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs index d6b4e6a..287b988 100644 --- a/OpenSim/Framework/AssemblyInfo.cs +++ b/OpenSim/Framework/AssemblyInfo.cs | |||
| @@ -59,4 +59,4 @@ using System.Runtime.InteropServices; | |||
| 59 | // Revision | 59 | // Revision |
| 60 | // | 60 | // |
| 61 | 61 | ||
| 62 | [assembly : AssemblyVersion("0.7.6.*")] | 62 | [assembly : AssemblyVersion("0.8.0.*")] |