diff options
| author | Rickard Green <[email protected]> | 2019-04-15 11:32:59 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-04-15 11:32:59 +0200 |
| commit | 7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2 (patch) | |
| tree | 8c7c12ca075bcc90cddc34a81c24354f73fb63b4 /erts/Makefile | |
| parent | fa20cc53c440a5da854f109fefc3a65270031844 (diff) | |
| parent | 22af152828a9b38aeab44d71300b4eca813964c9 (diff) | |
| download | otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.tar.gz otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.tar.bz2 otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'erts/Makefile')
0 files changed, 0 insertions, 0 deletions