diff options
| author | BlueWall | 2013-02-01 23:14:19 -0500 |
|---|---|---|
| committer | BlueWall | 2013-02-01 23:14:19 -0500 |
| commit | 219a25c985f91f896f3005af5ed20f07f1e9d97e (patch) | |
| tree | 24e0a279831430f41f596a644f4699af2465d12f /OpenSim/Server | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Revert "Update assembly version numbers" (diff) | |
| download | opensim-SC-219a25c985f91f896f3005af5ed20f07f1e9d97e.zip opensim-SC-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.gz opensim-SC-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.bz2 opensim-SC-219a25c985f91f896f3005af5ed20f07f1e9d97e.tar.xz | |
Merge /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Properties/AssemblyInfo.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Base/Properties/AssemblyInfo.cs b/OpenSim/Server/Base/Properties/AssemblyInfo.cs index 8b45564..4bbe358 100644 --- a/OpenSim/Server/Base/Properties/AssemblyInfo.cs +++ b/OpenSim/Server/Base/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")] |
diff --git a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs index d72d36a..53e9737 100644 --- a/OpenSim/Server/Handlers/Properties/AssemblyInfo.cs +++ b/OpenSim/Server/Handlers/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")] |
diff --git a/OpenSim/Server/Properties/AssemblyInfo.cs b/OpenSim/Server/Properties/AssemblyInfo.cs index ee45e10..ebc10fb 100644 --- a/OpenSim/Server/Properties/AssemblyInfo.cs +++ b/OpenSim/Server/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")] |