aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/erl_scan.erl
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2015-01-14 10:40:27 +0100
committerMarcus Arendt <[email protected]>2015-01-14 10:40:27 +0100
commit06b359e3c126804045b9b14852d14b46c2e1fee9 (patch)
tree7f9eff2467de5e4d21dfde9ef143688c162a1120 /lib/stdlib/src/erl_scan.erl
parent0c35538676e6598243721ef0488c2043b62715f2 (diff)
parent6d49fd3d4d66237924912cc6e6ab3d2512fce728 (diff)
downloadotp-06b359e3c126804045b9b14852d14b46c2e1fee9.tar.gz
otp-06b359e3c126804045b9b14852d14b46c2e1fee9.tar.bz2
otp-06b359e3c126804045b9b14852d14b46c2e1fee9.zip
Merge branch 'dotsimon/sctp_paddrinfo_state' into maint
* dotsimon/sctp_paddrinfo_state: Fix inet:getopts involving #sctp_paddrinfo{}
Diffstat (limited to 'lib/stdlib/src/erl_scan.erl')
0 files changed, 0 insertions, 0 deletions