aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-03-14 16:21:00 +0100
committerRickard Green <[email protected]>2017-03-14 16:21:00 +0100
commit27df945c35aa541330700d75b6844de9886361b2 (patch)
tree7fd93336232d2e8f17612ffcf114d9d7e1038fe9 /otp_build
parentaec64f75c5a2a044b9e5cec77fb2ca243ff1b212 (diff)
parenta748cafdc7063d9f181ba12088db6458793ced2f (diff)
downloadotp-27df945c35aa541330700d75b6844de9886361b2.tar.gz
otp-27df945c35aa541330700d75b6844de9886361b2.tar.bz2
otp-27df945c35aa541330700d75b6844de9886361b2.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Conflicts: OTP_VERSION lib/typer/doc/src/notes.xml lib/typer/vsn.mk
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions