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/AssemblyInfo.cs | |
| 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 '')
| -rw-r--r-- | OpenSim/Framework/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs index adeaeb2..02986d5 100644 --- a/OpenSim/Framework/AssemblyInfo.cs +++ b/OpenSim/Framework/AssemblyInfo.cs | |||
| @@ -59,5 +59,5 @@ using System.Runtime.InteropServices; | |||
| 59 | // Revision | 59 | // Revision |
| 60 | // | 60 | // |
| 61 | 61 | ||
| 62 | [assembly : AssemblyVersion("0.6.5.*")] | 62 | [assembly : AssemblyVersion("0.7.5.*")] |
| 63 | [assembly : AssemblyFileVersion("0.6.5.0")] \ No newline at end of file | 63 | [assembly : AssemblyFileVersion("0.6.5.0")] \ No newline at end of file |