diff options
| 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/ApplicationPlugins | |
| 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 | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/ApplicationPlugins')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index 1b6a3e1..4968e7b 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | // [assembly: AssemblyVersion("0.7.6.*")] | 63 | // [assembly: AssemblyVersion("0.7.6.*")] |
| 64 | 64 | ||
| 65 | [assembly : AssemblyVersion("0.7.6.*")] | 65 | [assembly : AssemblyVersion("0.8.0.*")] |
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs index 5683a72..ddef158 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/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 | ||
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs index a9d3f74..dd34cc8 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/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 | ||