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/Addons | |
| 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-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.xz | |
Merging Opensim upstream before generating patch
Diffstat (limited to 'OpenSim/Addons')
| -rw-r--r-- | OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs index 5ad087a..0a7fb5f 100644 --- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs +++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | |||
| @@ -30,7 +30,7 @@ using Mono.Addins; | |||
| 30 | // Build Number | 30 | // Build Number |
| 31 | // Revision | 31 | // Revision |
| 32 | // | 32 | // |
| 33 | [assembly: AssemblyVersion("0.8.1.*")] | 33 | [assembly: AssemblyVersion("0.8.2.*")] |
| 34 | 34 | ||
| 35 | [assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VersionNumber)] |
| 36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | 36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] |
diff --git a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs index 3868912..3e993b4 100644 --- a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs +++ b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs | |||
| @@ -30,7 +30,7 @@ using Mono.Addins; | |||
| 30 | // Build Number | 30 | // Build Number |
| 31 | // Revision | 31 | // Revision |
| 32 | // | 32 | // |
| 33 | [assembly: AssemblyVersion("0.8.1.*")] | 33 | [assembly: AssemblyVersion("0.8.2.*")] |
| 34 | 34 | ||
| 35 | [assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VersionNumber)] |
| 36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | 36 | [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] |