diff options
| author | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
| commit | c8d65c359ffcccf2e0fb61fcc31c45072f14b773 (patch) | |
| tree | 0d5e0fe48ababacd820479f95b3ab2239ec2c84d /OpenSim/Tools/pCampBot | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| download | opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.zip opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.gz opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.bz2 opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Tools/pCampBot')
0 files changed, 0 insertions, 0 deletions