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

author: Justin Clark-Casey (justincc) 2014-03-25 00:20:38 +0000
committer: Justin Clark-Casey (justincc) 2014-03-25 00:20:38 +0000
commit: 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch)
tree: a98354e9317e0ed6892dec344a69447c0e9c70b8 /Prebuild/src/Properties
parent: Don't fail to enable permissions modules correctly if there is any leading or... (diff)
parent: Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff)
download: opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip
opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz
opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2
opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index f3ac30f..013743d 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -61,7 +61,7 @@ using System.Resources;
 [assembly: AssemblyConfiguration(".NET CLR")]
 [assembly: AssemblyCompany("The Prebuild Project")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright 2004-2010 " +
+[assembly: AssemblyCopyright("Copyright 2004-2013 " +
                             "Matthew Holmes, " +
                             "Dan Moorehead, " +
                             "C.J. Adams-Collier, " +
@@ -71,7 +71,7 @@ using System.Resources;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyVersion("2.0.5.*")]
+[assembly: AssemblyVersion("2.0.6.*")]
 //
 // Version information for an assembly consists of the following four values:
author	Justin Clark-Casey (justincc)	2014-03-25 00:20:38 +0000
committer	Justin Clark-Casey (justincc)	2014-03-25 00:20:38 +0000
commit	091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch)
tree	a98354e9317e0ed6892dec344a69447c0e9c70b8 /Prebuild/src/Properties
parent	Don't fail to enable permissions modules correctly if there is any leading or... (diff)
parent	Fixed Debug command for Groups. (Use of wrong capitalization caused two "de... (diff)
download	opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz

diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs index f3ac30f..013743d 100644 --- a/Prebuild/src/Properties/AssemblyInfo.cs +++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -61,7 +61,7 @@ using System.Resources;
61	[assembly: AssemblyConfiguration(".NET CLR")]	61	[assembly: AssemblyConfiguration(".NET CLR")]
62	[assembly: AssemblyCompany("The Prebuild Project")]	62	[assembly: AssemblyCompany("The Prebuild Project")]
63	[assembly: AssemblyProduct("")]	63	[assembly: AssemblyProduct("")]
64	[assembly: AssemblyCopyright("Copyright 2004-2010 " +	64	[assembly: AssemblyCopyright("Copyright 2004-2013 " +
65	"Matthew Holmes, " +	65	"Matthew Holmes, " +
66	"Dan Moorehead, " +	66	"Dan Moorehead, " +
67	"C.J. Adams-Collier, " +	67	"C.J. Adams-Collier, " +
@@ -71,7 +71,7 @@ using System.Resources;
71	[assembly: AssemblyTrademark("")]	71	[assembly: AssemblyTrademark("")]
72	[assembly: AssemblyCulture("")]	72	[assembly: AssemblyCulture("")]
73	[assembly: NeutralResourcesLanguageAttribute("en-US")]	73	[assembly: NeutralResourcesLanguageAttribute("en-US")]
74	[assembly: AssemblyVersion("2.0.5.*")]	74	[assembly: AssemblyVersion("2.0.6.*")]
75		75
76	//	76	//
77	// Version information for an assembly consists of the following four values:	77	// Version information for an assembly consists of the following four values: