diff options
| author | Melanie | 2013-02-05 21:30:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-05 21:30:12 +0000 |
| commit | d3892bbd0674e4f6912ce89e54712ea405dbbfb8 (patch) | |
| tree | 70ea1e0fea0e7eff5664bed1103e63d08c7b1c47 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2 opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Servers/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs index 02ecc25..386be2d 100644 --- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
| 33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | [assembly: AssemblyFileVersion("1.0.0.0")] |
diff --git a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs index 021f63c..792c62e 100644 --- a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
| 33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | [assembly: AssemblyFileVersion("1.0.0.0")] |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index bb094ed..737c14d 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.5CM"; | 32 | private const string VERSION_NUMBER = "0.7.6CM"; |
| 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 |