OpenSimMirror/OpenSim/Data/SQLiteLegacy
Dan Lake 681190f682 Merge branch 'master' into danmerge
Conflicts:
	.nant/local.include
	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	bin/config-include/SimianGrid.ini
	prebuild.xml
2010-11-30 17:36:36 -08:00
..
Properties
Resources
SQLiteAssetData.cs
SQLiteAuthenticationData.cs
SQLiteAvatarData.cs
SQLiteEstateData.cs
SQLiteFramework.cs
SQLiteFriendsData.cs
SQLiteGenericTableHandler.cs
SQLiteInventoryStore.cs
SQLiteSimulationData.cs Merge branch 'master' into danmerge 2010-11-30 17:36:36 -08:00
SQLiteUserAccountData.cs
SQLiteUtils.cs
SQLiteXInventoryData.cs