aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Addons
diff options
context:
space:
mode:
authorDiva Canto2015-10-18 21:47:10 -0700
committerDiva Canto2015-10-18 21:51:49 -0700
commit59b63b64066d9da706c47e47bddd86a897ccd175 (patch)
treed288f5554f4e25cf5bfd0527083c888a847eda69 /OpenSim/Addons
parentAdded warning in RegionCombinerModule about it being considered obsolete and ... (diff)
downloadopensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.zip
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.gz
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.bz2
opensim-SC_OLD-59b63b64066d9da706c47e47bddd86a897ccd175.tar.xz
On to 0.8.3!
Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
Diffstat (limited to 'OpenSim/Addons')
-rw-r--r--OpenSim/Addons/Groups/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs
index 0a7fb5f..cf0de1d 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.2.*")] 33[assembly: AssemblyVersion("0.8.3.*")]
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 3e993b4..0699660 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.2.*")] 33[assembly: AssemblyVersion("0.8.3.*")]
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)]