aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-21 20:46:32 +0100
committerRickard Green <[email protected]>2019-03-21 20:46:32 +0100
commit7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6 (patch)
treec56e50604d0a2828e9b8d73081ae46315242be9b /make
parent4c8c3f0e66c3d200a2e5891b0649c87f85fe0db2 (diff)
parentdb4eefa49350bb18089f80e21464865f641b614f (diff)
downloadotp-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