aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-08-12 14:38:36 +0200
committerRickard Green <[email protected]>2016-08-12 14:38:36 +0200
commitb412ea7ed2513400bcaa63581ae68219e7cce2d6 (patch)
treeacbe8ad2f9a25e75faaaeff6e7317e186ad1bec7 /lib
parent49722eb3e32b92563e576283d84531797c2a3627 (diff)
parent7518684155aaabdde97c7b624803523c045bc185 (diff)
downloadotp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.tar.gz
otp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.tar.bz2
otp-b412ea7ed2513400bcaa63581ae68219e7cce2d6.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Prepare release Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk otp_versions.table
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions