aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
diff options
context:
space:
mode:
authorMelanie2012-07-29 16:11:20 +0100
committerMelanie2012-07-29 16:11:20 +0100
commite012c81d7c883fda33edb1094dd165214804bff9 (patch)
tree4ef031a39490ef0202a298190b5168ac99213944 /OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs
parentMerge branch 'master' into careminster (diff)
parentReturn world rotation on llGetObjectDetails()'s OBJECT_ROT (diff)
downloadopensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.zip
opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.gz
opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.bz2
opensim-SC-e012c81d7c883fda33edb1094dd165214804bff9.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions