diff options
| author | Melanie | 2012-02-02 01:53:13 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-02 01:53:13 +0000 |
| commit | dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d (patch) | |
| tree | c068a3475149cb2bd721da21a3eeb63f2b78cb5e /OpenSim/Data | |
| parent | Improve reliability of script state saving by covering various saving (diff) | |
| parent | Improve reliability of script state saving by covering various saving (diff) | |
| download | opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.zip opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.gz opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.bz2 opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions