diff options
| author | Melanie | 2012-08-14 16:51:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-14 16:51:47 +0100 |
| commit | e81e26498bf10e34887a80c9629d356016408242 (patch) | |
| tree | e6e3948cfc472d9ee6c02ef16c0f22c68aa871f5 /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Perform ownership transfer and permission propagation as well as needed (diff) | |
| download | opensim-SC_OLD-e81e26498bf10e34887a80c9629d356016408242.zip opensim-SC_OLD-e81e26498bf10e34887a80c9629d356016408242.tar.gz opensim-SC_OLD-e81e26498bf10e34887a80c9629d356016408242.tar.bz2 opensim-SC_OLD-e81e26498bf10e34887a80c9629d356016408242.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
0 files changed, 0 insertions, 0 deletions