diff options
author | Diva Canto | 2009-08-11 10:51:49 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-11 10:51:49 -0700 |
commit | dc897b228826c5e5c9db62e13fd9cb6872ff15b6 (patch) | |
tree | da499f946125f00291e23c72c468a2bff579551c /.gitignore | |
parent | Improved test for system folders. Removed log messages. (diff) | |
parent | Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on th... (diff) | |
download | opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.zip opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.gz opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.bz2 opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.xz |
Merged with origin, and resolved one conflict in LoginServiceTests.cs
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -43,3 +43,4 @@ OpenSim/OpenSim.usertasks | |||
43 | TAGS | 43 | TAGS |
44 | *~ | 44 | *~ |
45 | Makefile.local | 45 | Makefile.local |
46 | bin/.version | ||