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/Framework/Communications/Properties | |
| 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/Framework/Communications/Properties')
| -rw-r--r-- | OpenSim/Framework/Communications/Properties/AssemblyInfo.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs index 2df6ace..6d1c03a 100644 --- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs | |||
| @@ -32,12 +32,12 @@ using System.Runtime.InteropServices; | |||
| 32 | // set of attributes. Change these attribute values to modify the information | 32 | // set of attributes. Change these attribute values to modify the information |
| 33 | // associated with an assembly. | 33 | // associated with an assembly. |
| 34 | 34 | ||
| 35 | [assembly : AssemblyTitle("OpenGrid.Framework.Communications")] | 35 | [assembly : AssemblyTitle("OpenSim.Framework.Communications")] |
| 36 | [assembly : AssemblyDescription("")] | 36 | [assembly : AssemblyDescription("")] |
| 37 | [assembly : AssemblyConfiguration("")] | 37 | [assembly : AssemblyConfiguration("")] |
| 38 | [assembly : AssemblyCompany("http://opensimulator.org")] | 38 | [assembly : AssemblyCompany("http://opensimulator.org")] |
| 39 | [assembly : AssemblyProduct("OpenGrid.Framework.Communications")] | 39 | [assembly : AssemblyProduct("OpenSim")] |
| 40 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")] | 40 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")] |
| 41 | [assembly : AssemblyTrademark("")] | 41 | [assembly : AssemblyTrademark("")] |
| 42 | [assembly : AssemblyCulture("")] | 42 | [assembly : AssemblyCulture("")] |
| 43 | 43 | ||
| @@ -61,5 +61,5 @@ using System.Runtime.InteropServices; | |||
| 61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | 63 | ||
| 64 | [assembly : AssemblyVersion("0.6.5.*")] | 64 | [assembly : AssemblyVersion("0.7.5.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | [assembly : AssemblyFileVersion("0.6.5.0")] |