diff options
| author | Melanie | 2012-03-31 02:18:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-31 02:18:02 +0100 |
| commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
| tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
| download | opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 63ec257..016a174 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -39,7 +39,8 @@ namespace OpenSim | |||
| 39 | RC1, | 39 | RC1, |
| 40 | RC2, | 40 | RC2, |
| 41 | Release, | 41 | Release, |
| 42 | Post_Fixes | 42 | Post_Fixes, |
| 43 | Extended | ||
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | public static string Version | 46 | public static string Version |