Justin Clark-Casey (justincc) 5925aac859 Add --merge switch to load iar. ... When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour		2010-06-30 00:10:44 +01:00
..
External	Merge branch 'master' into presence-refactor	2010-02-15 00:20:48 +00:00
Tests	* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.	2010-05-05 21:22:29 -04:00
ArchiveConstants.cs	Add --merge switch to load iar.	2010-06-30 00:10:44 +01:00
TarArchiveReader.cs	Thank you kindly, dslake, for a patch that:	2009-08-02 19:30:25 +00:00
TarArchiveWriter.cs	add prim item and test asset save in save oar unit test	2010-05-21 19:36:39 +01:00