aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-02-29 20:47:13 +0100
committerSverker Eriksson <[email protected]>2016-02-29 20:47:13 +0100
commit6f8997c001a17b9d9322e26757690489d6111dac (patch)
tree83b06efba66cd23ccdc5316a84c125704456d2ef /lib/orber
parent4db755067a986316540ec174101e675475a94f6a (diff)
parente7f96c4bc2d38feaab718bd61bcfb3ddc956dd25 (diff)
downloadotp-6f8997c001a17b9d9322e26757690489d6111dac.tar.gz
otp-6f8997c001a17b9d9322e26757690489d6111dac.tar.bz2
otp-6f8997c001a17b9d9322e26757690489d6111dac.zip
Merge branch 'maint-r16' into maint
Fake merge. OTP-13384 was backported from OTP 18.
Diffstat (limited to 'lib/orber')
0 files changed, 0 insertions, 0 deletions