diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/Physics/BasicPhysicsPlugin | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs index 063eb54..fb9cb66 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs | |||
| @@ -39,7 +39,7 @@ using System.Runtime.InteropServices; | |||
| 39 | [assembly : AssemblyConfiguration("")] | 39 | [assembly : AssemblyConfiguration("")] |
| 40 | [assembly : AssemblyCompany("http://opensimulator.org")] | 40 | [assembly : AssemblyCompany("http://opensimulator.org")] |
| 41 | [assembly : AssemblyProduct("BasicPhysicsPlugin")] | 41 | [assembly : AssemblyProduct("BasicPhysicsPlugin")] |
| 42 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")] | 42 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")] |
| 43 | [assembly : AssemblyTrademark("")] | 43 | [assembly : AssemblyTrademark("")] |
| 44 | [assembly : AssemblyCulture("")] | 44 | [assembly : AssemblyCulture("")] |
| 45 | 45 | ||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.6.5.*")] | 58 | [assembly : AssemblyVersion("0.7.5.*")] |