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/ApplicationPlugins | |
| 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/ApplicationPlugins')
3 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index b81c1e5..1b6a3e1 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
| @@ -63,4 +63,3 @@ using System.Runtime.InteropServices; | |||
| 63 | // [assembly: AssemblyVersion("0.7.6.*")] | 63 | // [assembly: AssemblyVersion("0.7.6.*")] |
| 64 | 64 | ||
| 65 | [assembly : AssemblyVersion("0.7.6.*")] | 65 | [assembly : AssemblyVersion("0.7.6.*")] |
| 66 | [assembly : AssemblyFileVersion("0.6.5.0")] \ No newline at end of file | ||
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs index be6054d..5683a72 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/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/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs index 3ec7a13..a9d3f74 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/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 | |