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 /prebuild.xml
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/prebuild.xml b/prebuild.xml
index 123f569..329ef7b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2178,7 +2178,7 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteLegacy" path="OpenSim/Data/SQLiteLegacy" type="Library">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -2215,7 +2215,7 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
author	Melanie	2010-04-30 19:29:21 +0100
committer	Melanie	2010-04-30 19:29:21 +0100
commit	23282935f1f25fd44d85193f3c13ea97c755f75c (patch)
tree	689d44f5657dd36e74c3b4d4dd508c86ee90cea1 /prebuild.xml
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/prebuild.xml b/prebuild.xml index 123f569..329ef7b 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -2178,7 +2178,7 @@
2178	</Files>	2178	</Files>
2179	</Project>	2179	</Project>
2180		2180
2181	<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">	2181	<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteLegacy" path="OpenSim/Data/SQLiteLegacy" type="Library">
2182	<Configuration name="Debug">	2182	<Configuration name="Debug">
2183	<Options>	2183	<Options>
2184	<OutputPath>../../../bin/</OutputPath>	2184	<OutputPath>../../../bin/</OutputPath>
@@ -2215,7 +2215,7 @@
2215	</Files>	2215	</Files>
2216	</Project>	2216	</Project>
2217		2217
2218	<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">	2218	<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
2219	<Configuration name="Debug">	2219	<Configuration name="Debug">
2220	<Options>	2220	<Options>
2221	<OutputPath>../../../bin/</OutputPath>	2221	<OutputPath>../../../bin/</OutputPath>