aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-04 20:56:52 +0100
committerJustin Clark-Casey (justincc)2010-08-04 20:56:52 +0100
commita133acbd5fc1a402796dfeb014ade20db77d4824 (patch)
tree7aae3a2c1eabc0d17f917800e735cc88e8631e72 /.gitignore
parentBetter debug messages (diff)
parentAdd --merge switch to load iar. (diff)
downloadopensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.zip
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.gz
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.bz2
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.xz
Merge branch 'iar-merge'
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions