diff options
| author | Justin Clark-Casey (justincc) | 2013-02-20 22:11:04 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-20 22:11:04 +0000 |
| commit | 99ebff94b5763d6b5a38bdcdb7c493a93ce9981a (patch) | |
| tree | 0fcf1c81b5dff3eda856e036031454f8c765633f /OpenSim/Region/Physics | |
| parent | Correct mistake in parsing 'show object pos' and similar pos commands where t... (diff) | |
| parent | Fix the JsonStore path set problem justincc found earlier today and (diff) | |
| download | opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.zip opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.gz opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.bz2 opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs index d240c71..02b03a8 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/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/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs index cafd7f4..f611b9a 100644 --- a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | |||
| @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; | |||
| 33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
| 34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | [assembly: AssemblyVersion("0.7.6.*")] | 35 | [assembly: AssemblyVersion("0.7.6.*")] |
| 36 | [assembly: AssemblyFileVersion("1.0.0.0")] | 36 | |
diff --git a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs index bd70296..3de061a 100644 --- a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Meshing/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 | |