diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-13 12:36:06 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-13 12:36:06 +0100 |
| commit | db7c5ee3c64a7039fe1efda939167ebb954c31bf (patch) | |
| tree | 80b9804622ea431a71bdb85e44974211e66a7ac6 /erts/doc/Makefile | |
| parent | a7f6ce5e2d66f0f3425f38994e6f5256006c3984 (diff) | |
| parent | dc0b345ae5374a422250c9d2e3bec63e6186afca (diff) | |
| download | otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.tar.gz otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.tar.bz2 otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
kernel: Add os:cmd/2 with max_size option
# Conflicts:
# OTP_VERSION
# lib/kernel/doc/src/os.xml
# lib/kernel/src/os.erl
Diffstat (limited to 'erts/doc/Makefile')
0 files changed, 0 insertions, 0 deletions