diff options
author | Melanie | 2012-04-25 02:33:39 +0100 |
---|---|---|
committer | Melanie | 2012-04-25 02:33:39 +0100 |
commit | 9a235018247cb8dfe07043c354b31da155d19e1f (patch) | |
tree | db8c223bc505a0bf9437d3550f4a101d24874545 /Prebuild/prebuild | |
parent | Merge branch 'master' into careminster (diff) | |
parent | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff) | |
download | opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.zip opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2 opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'Prebuild/prebuild')
0 files changed, 0 insertions, 0 deletions