diff options
| author | Melanie | 2012-09-07 19:49:46 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-07 19:49:46 +0100 |
| commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
| tree | 110f0e402b879f49943ff2e76598e2241e20057c /OpenSim/Framework/Servers | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 016a174..bb094ed 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -29,7 +29,7 @@ namespace OpenSim | |||
| 29 | { | 29 | { |
| 30 | public class VersionInfo | 30 | public class VersionInfo |
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.7.4CM"; | 32 | private const string VERSION_NUMBER = "0.7.5CM"; |
| 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 34 | 34 | ||
| 35 | public enum Flavour | 35 | public enum Flavour |