From 2239ecba188b0435d9a6d58b1c66f2b6eb591116 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 8 Jun 2007 19:10:55 +0000
Subject: *Merged EstateManager, EstateSettings, ParcelManager,Parcel, and
ParcelData classes *Incorporated EstateSettings into the RegionInfo class
*Next step is to load from db, save to db the parcel and estate settings
---
.../OpenGrid.Framework.Data.SQLite.csproj | 111 ---------------------
1 file changed, 111 deletions(-)
(limited to 'OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj')
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 4360031..fa17367 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -1,113 +1,3 @@
-<<<<<<< .mine
-
-
- Local
- 8.0.50727
- 2.0
- {1E3F341A-0000-0000-0000-000000000000}
- Debug
- AnyCPU
-
-
-
- OpenGrid.Framework.Data.SQLite
- JScript
- Grid
- IE50
- false
- Library
-
- OpenGrid.Framework.Data.SQLite
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- System.Xml.dll
- False
-
-
- System.Data.dll
- False
-
-
- ..\..\bin\System.Data.SQLite.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
-
-
- OpenGrid.Framework.Data
- {62CDF671-0000-0000-0000-000000000000}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-=======
Local
@@ -216,4 +106,3 @@
->>>>>>> .r921
--
cgit v1.1