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/Region/Framework/Properties | |
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/Region/Framework/Properties')
-rw-r--r-- | OpenSim/Region/Framework/Properties/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs index fd9ab3d..97dea1f 100644 --- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs | |||
@@ -31,6 +31,6 @@ using Mono.Addins; | |||
31 | // Build Number | 31 | // Build Number |
32 | // Revision | 32 | // Revision |
33 | // | 33 | // |
34 | [assembly: AssemblyVersion("0.8.1.*")] | 34 | [assembly: AssemblyVersion("0.8.2.*")] |
35 | [assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] | 35 | [assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] |
36 | 36 | ||