diff options
| author | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
|---|---|---|
| committer | Michael Heilmann | 2015-05-19 15:18:45 -0400 |
| commit | 140ea04b9d692344d803fc87364fb252561725c3 (patch) | |
| tree | d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/Data | |
| parent | Merge pull request #7 from gamucf/moses.metricsPhase2 (diff) | |
| parent | resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff) | |
| download | opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC_OLD-140ea04b9d692344d803fc87364fb252561725c3.tar.xz | |
Merging Opensim upstream before generating patch
Diffstat (limited to 'OpenSim/Data')
| -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/PGSQL/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/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs index 249842c..b46d175 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.8.1.*")] | 64 | [assembly : AssemblyVersion("0.8.2.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs index 13e28a8..a827bd0 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.8.1.*")] | 64 | [assembly : AssemblyVersion("0.8.2.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs index 1c65dbe..1e88b2c 100644 --- a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/PGSQL/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.8.1.*")] | 64 | [assembly : AssemblyVersion("0.8.2.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs index 4e41308..b1f234b 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.8.1.*")] | 64 | [assembly : AssemblyVersion("0.8.2.*")] |
| 65 | 65 | ||
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs index 2befd13..d2e62d2 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.8.1.*")] | 64 | [assembly : AssemblyVersion("0.8.2.*")] |
| 65 | 65 | ||