diff options
| author | Rickard Green <[email protected]> | 2019-03-21 20:46:32 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-21 20:46:32 +0100 |
| commit | 7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6 (patch) | |
| tree | c56e50604d0a2828e9b8d73081ae46315242be9b /make | |
| parent | 4c8c3f0e66c3d200a2e5891b0649c87f85fe0db2 (diff) | |
| parent | db4eefa49350bb18089f80e21464865f641b614f (diff) | |
| download | otp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.tar.gz otp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.tar.bz2 otp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions