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

author: Melanie 2010-04-30 19:29:21 +0100
committer: Melanie 2010-04-30 19:29:21 +0100
commit: 23282935f1f25fd44d85193f3c13ea97c755f75c (patch)
tree: 689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
parent: Fix a null ref from trying to access a dictionary that was never initialized. (diff)
parent: * XInventory fairly tested, including for HG. Almost ready to switch. (diff)
download: opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.zip
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.gz
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.bz2
opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLiteNG/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
index 4aeb67b..609a024 100644
--- a/OpenSim/Data/SQLiteNG/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly : AssemblyTitle("OpenSim.Data.SQLiteNG")]
+[assembly : AssemblyTitle("OpenSim.Data.SQLiteLegacy")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OpenSim.Data.SQLiteNG")]
+[assembly : AssemblyProduct("OpenSim.Data.SQLiteLegacy")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
author	Melanie	2010-04-30 19:29:21 +0100
committer	Melanie	2010-04-30 19:29:21 +0100
commit	23282935f1f25fd44d85193f3c13ea97c755f75c (patch)
tree	689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
parent	Fix a null ref from trying to access a dictionary that was never initialized. (diff)
parent	* XInventory fairly tested, including for HG. Almost ready to switch. (diff)
download	opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.zip opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.gz opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.bz2 opensim-SC_OLD-23282935f1f25fd44d85193f3c13ea97c755f75c.tar.xz

diff --git a/OpenSim/Data/SQLiteNG/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs index 4aeb67b..609a024 100644 --- a/OpenSim/Data/SQLiteNG/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32	// set of attributes. Change these attribute values to modify the information	32	// set of attributes. Change these attribute values to modify the information
33	// associated with an assembly.	33	// associated with an assembly.
34		34
35	[assembly : AssemblyTitle("OpenSim.Data.SQLiteNG")]	35	[assembly : AssemblyTitle("OpenSim.Data.SQLiteLegacy")]
36	[assembly : AssemblyDescription("")]	36	[assembly : AssemblyDescription("")]
37	[assembly : AssemblyConfiguration("")]	37	[assembly : AssemblyConfiguration("")]
38	[assembly : AssemblyCompany("http://opensimulator.org")]	38	[assembly : AssemblyCompany("http://opensimulator.org")]
39	[assembly : AssemblyProduct("OpenSim.Data.SQLiteNG")]	39	[assembly : AssemblyProduct("OpenSim.Data.SQLiteLegacy")]
40	[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]	40	[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
41	[assembly : AssemblyTrademark("")]	41	[assembly : AssemblyTrademark("")]
42	[assembly : AssemblyCulture("")]	42	[assembly : AssemblyCulture("")]