diff options
author | Melanie | 2013-02-22 01:28:54 +0000 |
---|---|---|
committer | Melanie | 2013-02-22 01:28:54 +0000 |
commit | 9534d5f9296979b68550177a5201c2bdba84f14e (patch) | |
tree | 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /OpenSim/Framework/RegionLoader | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/RegionLoader')
-rw-r--r-- | OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs index f836350..d4806f1 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs | |||
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices; | |||
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.7.6.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | |
diff --git a/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs b/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs index 72fa679..1541a5b 100644 --- a/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs | |||
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices; | |||
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.7.6.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | |