diff options
| author | Rickard Green <[email protected]> | 2019-05-08 10:09:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-05-08 10:09:17 +0200 |
| commit | a85ee28f2b72a72da63ada2561e2dd53afdbf6d9 (patch) | |
| tree | 2b52861c132fc4c2c5f30b2e80533b3df0a14fd2 /erts/autoconf/vxworks | |
| parent | 79df59b5e0643a236fdc238e7417053f84e50c77 (diff) | |
| parent | c9fdce99cd311eb07a6cbac2c25186f7609b565c (diff) | |
| download | otp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.tar.gz otp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.tar.bz2 otp-a85ee28f2b72a72da63ada2561e2dd53afdbf6d9.zip | |
Merge branch 'maint'
* maint:
Fix bad merge from maint-21
Fix bad merge from maint-21
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'erts/autoconf/vxworks')
0 files changed, 0 insertions, 0 deletions