aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2012-06-15 02:52:56 +0100
committerMelanie2012-06-15 02:52:56 +0100
commitca4e6d9b5b408d31d5778578cf41d1c77198287f (patch)
tree2348d8a79ce819e3adbdf54fd0458a4d0ed7091d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentMerge branch 'master' into careminster (diff)
parentFix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 (diff)
downloadopensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.zip
opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.gz
opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.bz2
opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
0 files changed, 0 insertions, 0 deletions