diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /prebuild.xml | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'prebuild.xml')
0 files changed, 0 insertions, 0 deletions