aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/data/avataranimations.xml
diff options
context:
space:
mode:
authorMelanie2012-10-03 17:40:11 +0100
committerMelanie2012-10-03 17:40:11 +0100
commitbf565e9747bfd411ac6d2405bdbd26b519735dd3 (patch)
tree84dc5992afbbdc5795060957963cfc76949a978c /bin/data/avataranimations.xml
parentMerge branch 'master' into careminster (diff)
parentFix a viewer crash issue (diff)
downloadopensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.zip
opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.gz
opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.bz2
opensim-SC-bf565e9747bfd411ac6d2405bdbd26b519735dd3.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/data/avataranimations.xml')
0 files changed, 0 insertions, 0 deletions