aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/README.txt
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-29 23:58:14 -0400
committerJonathan Freedman2010-10-29 23:58:14 -0400
commitc8d65c359ffcccf2e0fb61fcc31c45072f14b773 (patch)
tree0d5e0fe48ababacd820479f95b3ab2239ec2c84d /README.txt
parentMerge branch 'master' into mantis5110 (diff)
parentRename the new default texture to be consistent with the others (diff)
downloadopensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.zip
opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.gz
opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.bz2
opensim-SC-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.xz
Merge branch 'master' into mantis5110
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'README.txt')
0 files changed, 0 insertions, 0 deletions