aboutsummaryrefslogtreecommitdiffstats
path: root/otp_versions.table
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-09-22 17:55:15 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-09-22 17:55:15 +0200
commit8c8bd46bcc9d839e5de0687784d15dc819cb3ee8 (patch)
treee96eeeef77fbff40138ddf35576823921dc110fb /otp_versions.table
parentc5afc45c9236a90dc408c9284a069a9dc233ad4e (diff)
parentbca562455e1e8cb8be5a5a5de53c926eba51f977 (diff)
downloadotp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.tar.gz
otp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.tar.bz2
otp-8c8bd46bcc9d839e5de0687784d15dc819cb3ee8.zip
Merge branch 'maint'
Conflicts: lib/stdlib/src/erl_pp.erl
Diffstat (limited to 'otp_versions.table')
0 files changed, 0 insertions, 0 deletions