aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-02-10 11:21:42 +0100
committerSiri Hansen <[email protected]>2016-02-10 11:21:42 +0100
commit505a69774fe789bbf7c264574f360c683dd0fcc3 (patch)
tree89358837669643af0dd0d93c4dd995608c3ea11e /make
parentbaf313fb8b603bb249ed1c30207ceb47aa52aff9 (diff)
parent8fba155bdc0b45f0504756d1ea695d9c53a44f80 (diff)
downloadotp-505a69774fe789bbf7c264574f360c683dd0fcc3.tar.gz
otp-505a69774fe789bbf7c264574f360c683dd0fcc3.tar.bz2
otp-505a69774fe789bbf7c264574f360c683dd0fcc3.zip
Merge branch 'maint'
Conflicts: lib/stdlib/src/supervisor.erl
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions