aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/Resources
diff options
context:
space:
mode:
authorMelanie2012-08-18 19:01:05 +0100
committerMelanie2012-08-18 19:01:05 +0100
commit914f97cb761842b9e5627adde78fe36eccc753bd (patch)
treee1eebb8ebd92ee8019f7bfd9262d88501e5aaf38 /OpenSim/Region/ScriptEngine/XEngine/Resources
parentMerge branch 'master' into careminster (diff)
parentintegrating redundant code into operator (diff)
downloadopensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.zip
opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.tar.gz
opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.tar.bz2
opensim-SC-914f97cb761842b9e5627adde78fe36eccc753bd.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/Resources')
0 files changed, 0 insertions, 0 deletions