ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iar-merge'

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-04 20:56:52 +01:00
parent a1d7911feb 5925aac859
commit a133acbd5f
6 changed files with 167 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*