aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
diff options
context:
space:
mode:
authorMelanie2012-06-02 02:01:48 +0100
committerMelanie2012-06-02 02:01:48 +0100
commit8e735efff0849c45dd24ae15dfdf34f7959701c5 (patch)
tree55b5f15068782e2dba04deb4d0e8b1ff90140cba /OpenSim/Framework/Tests/MundaneFrameworkTests.cs
parentMerge branch 'master' into careminster (diff)
parentFix LSL animation state reporting and animation state transitions on crossing (diff)
downloadopensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.zip
opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.gz
opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.bz2
opensim-SC-8e735efff0849c45dd24ae15dfdf34f7959701c5.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/Tests/MundaneFrameworkTests.cs')
0 files changed, 0 insertions, 0 deletions