Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2013-02-05 20:09:45 +0000
committer: Melanie 2013-02-05 20:09:45 +0000
commit: 6bce4bc11291a6833f4645feeb58024deefe32ee (patch)
tree: f8815e0eaa129c4c367e09ab1b133e4d4ade29b7 /OpenSim/Capabilities
parent: Try to fix uploaded mesh rotations - code from Avination code base. (diff)
parent: Fix bug where viewers would not see the "Module command functions not enabled... (diff)
download: opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.zip
opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.gz
opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.bz2
opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
index a681fb6..4ff5fe1 100644
--- a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Capabilities/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Properties/AssemblyInfo.cs
index 26254f2..f8a9dae 100644
--- a/OpenSim/Capabilities/Properties/AssemblyInfo.cs
+++ b/OpenSim/Capabilities/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
author	Melanie	2013-02-05 20:09:45 +0000
committer	Melanie	2013-02-05 20:09:45 +0000
commit	6bce4bc11291a6833f4645feeb58024deefe32ee (patch)
tree	f8815e0eaa129c4c367e09ab1b133e4d4ade29b7 /OpenSim/Capabilities
parent	Try to fix uploaded mesh rotations - code from Avination code base. (diff)
parent	Fix bug where viewers would not see the "Module command functions not enabled... (diff)
download	opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.zip opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.gz opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.bz2 opensim-SC_OLD-6bce4bc11291a6833f4645feeb58024deefe32ee.tar.xz

diff --git a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs index a681fb6..4ff5fe1 100644 --- a/OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs +++ b/OpenSim/Capabilities/Handlers/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/Capabilities/Properties/AssemblyInfo.cs b/OpenSim/Capabilities/Properties/AssemblyInfo.cs index 26254f2..f8a9dae 100644 --- a/OpenSim/Capabilities/Properties/AssemblyInfo.cs +++ b/OpenSim/Capabilities/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")]