diff options
author | Hans Nilsson <[email protected]> | 2016-12-06 12:10:59 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2016-12-06 12:10:59 +0100 |
commit | a0d365fc3c41464e77d24942aa3255788c5959a5 (patch) | |
tree | ab459a079f66abeedb75c4fe9dc8217c9c1ba288 /erts/emulator/nifs | |
parent | 86233038e1d49adb6387b810a7ba2487b15d6a02 (diff) | |
parent | 21aaf7cd91a5b36481d693341b7ee6221ce83286 (diff) | |
download | otp-a0d365fc3c41464e77d24942aa3255788c5959a5.tar.gz otp-a0d365fc3c41464e77d24942aa3255788c5959a5.tar.bz2 otp-a0d365fc3c41464e77d24942aa3255788c5959a5.zip |
Merge branch 'hans/eldap/prepare_release' into maint
Eldap vsn.mk (version) was updated alhough it shouldn't.
Diffstat (limited to 'erts/emulator/nifs')
0 files changed, 0 insertions, 0 deletions