aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/Properties
diff options
context:
space:
mode:
authorBlueWall2013-02-01 23:14:19 -0500
committerBlueWall2013-02-01 23:14:19 -0500
commit219a25c985f91f896f3005af5ed20f07f1e9d97e (patch)
tree24e0a279831430f41f596a644f4699af2465d12f /OpenSim/Region/RegionCombinerModule/Properties
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentRevert "Update assembly version numbers" (diff)
downloadopensim-SC_OLD-219a25c985f91f896f3005af5ed20f07f1e9d97e.zip
opensim-SC_OLD-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.gz
opensim-SC_OLD-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.bz2
opensim-SC_OLD-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.xz
Merge /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/Properties')
-rw-r--r--OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index ca945b5..085eb59 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.7.6.*")] 32[assembly: AssemblyVersion("0.7.5.*")]
33[assembly: AssemblyFileVersion("1.0.0.0")] 33[assembly: AssemblyFileVersion("1.0.0.0")]