diff options
| author | Melanie | 2011-10-25 02:35:33 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:35:33 +0100 |
| commit | b7237ef059ab018ab38a2b42764251271603daf0 (patch) | |
| tree | 0dfeb325870a24daa02f162764fbf65b283eedef /Makefile | |
| parent | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge (diff) | |
| parent | refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... (diff) | |
| download | opensim-SC_OLD-b7237ef059ab018ab38a2b42764251271603daf0.zip opensim-SC_OLD-b7237ef059ab018ab38a2b42764251271603daf0.tar.gz opensim-SC_OLD-b7237ef059ab018ab38a2b42764251271603daf0.tar.bz2 opensim-SC_OLD-b7237ef059ab018ab38a2b42764251271603daf0.tar.xz | |
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions