diff options
| author | Melanie | 2012-02-23 01:49:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-23 01:49:14 +0000 |
| commit | f1a76195ea58b8efb22f6f56980c1d7960e195b8 (patch) | |
| tree | 972beaa1d2a234f7792d9beaedbdef58e963c690 /prebuild.xml | |
| parent | Add permission checks to scripted object movements, which didn't respect bans (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.zip opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.gz opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.bz2 opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'prebuild.xml')
0 files changed, 0 insertions, 0 deletions