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 /ThirdParty | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'ThirdParty')
| -rw-r--r-- | ThirdParty/SmartThreadPool/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ThirdParty/SmartThreadPool/AssemblyInfo.cs b/ThirdParty/SmartThreadPool/AssemblyInfo.cs index 8f20d79..af9baff 100644 --- a/ThirdParty/SmartThreadPool/AssemblyInfo.cs +++ b/ThirdParty/SmartThreadPool/AssemblyInfo.cs | |||
| @@ -29,7 +29,7 @@ using System.Runtime.InteropServices; | |||
| 29 | // You can specify all the values or you can default the Revision and Build Numbers | 29 | // You can specify all the values or you can default the Revision and Build Numbers |
| 30 | // by using the '*' as shown below: | 30 | // by using the '*' as shown below: |
| 31 | 31 | ||
| 32 | [assembly: AssemblyVersion("1.0.0.0")] | 32 | [assembly: AssemblyVersion("0.7.5.*")] |
| 33 | 33 | ||
| 34 | // | 34 | // |
| 35 | // In order to sign your assembly you must specify a key to use. Refer to the | 35 | // In order to sign your assembly you must specify a key to use. Refer to the |