diff options
| author | Melanie | 2012-01-06 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-06 21:41:36 +0000 |
| commit | 11c48ac80708051a7d5b32ced81712b5c1be77aa (patch) | |
| tree | 3a1e0fdd41b7c8a47072b84037828a9f4db31f27 /nant-color | |
| parent | Replaced llRot2Euler function. (diff) | |
| parent | eliminate a few tabs from OpenSimDefaults.ini (diff) | |
| download | opensim-SC-11c48ac80708051a7d5b32ced81712b5c1be77aa.zip opensim-SC-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.gz opensim-SC-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.bz2 opensim-SC-11c48ac80708051a7d5b32ced81712b5c1be77aa.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
Diffstat (limited to 'nant-color')
0 files changed, 0 insertions, 0 deletions