aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-05-02 13:10:57 +0200
committerHans Nilsson <[email protected]>2016-05-02 13:10:57 +0200
commitcce629e48e7de36acce614903386cf637040ba58 (patch)
tree58504f1ad91a097978cb352682f8856973e80142 /erts
parent7c2e7f8d3b2ae18c08a5d822976cc31f6f354f92 (diff)
parent65b6b7309b2aa1cf3b74698c82bbd40fb0236c16 (diff)
downloadotp-cce629e48e7de36acce614903386cf637040ba58.tar.gz
otp-cce629e48e7de36acce614903386cf637040ba58.tar.bz2
otp-cce629e48e7de36acce614903386cf637040ba58.zip
Merge branch 'hans/eldap/prepare_release'
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions