diff options
| author | Raimo Niskanen <[email protected]> | 2016-07-25 14:26:45 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-07-25 14:29:35 +0200 |
| commit | 825145898d7bf69147c1e6a6ad66c3454e7ec8f1 (patch) | |
| tree | 0fb49da4d912ab0dd1eda8f492fabf8c78c3b444 /lib/Makefile | |
| parent | 2ed9828f26e420543eefced8b8138c474694cd91 (diff) | |
| parent | f5ef4087331c0181fd154dcaa372a05e6f8bd408 (diff) | |
| download | otp-825145898d7bf69147c1e6a6ad66c3454e7ec8f1.tar.gz otp-825145898d7bf69147c1e6a6ad66c3454e7ec8f1.tar.bz2 otp-825145898d7bf69147c1e6a6ad66c3454e7ec8f1.zip | |
Merge branch 'maint-18' into maint
Conflicts:
OTP_VERSION
erts/doc/src/notes.xml
erts/vsn.mk
lib/common_test/doc/src/notes.xml
lib/common_test/vsn.mk
lib/ssl/doc/src/notes.xml
lib/ssl/src/ssl.appup.src
lib/ssl/vsn.mk
lib/stdlib/test/ets_SUITE.erl
otp_versions.table
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions