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/Data | |
| 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/Data')
| -rw-r--r-- | OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/Null/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs index 9bc580e..38bb868 100644 --- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs | |||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs index 1146d92..f562300 100644 --- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs | |||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs index 1e02c31..28ef51a 100644 --- a/OpenSim/Data/Null/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs | |||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs index a85f473..9258e55 100644 --- a/OpenSim/Data/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Properties/AssemblyInfo.cs | |||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs index 992982c..3873eaf 100644 --- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | |||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.7.6.*")] | 64 | [assembly : AssemblyVersion("0.8.0.*")] |
| 65 | 65 | ||