aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-02-09 14:55:23 +0100
committerSiri Hansen <[email protected]>2017-02-09 14:55:23 +0100
commit83ba37210640e71308acec58986cfddb0c2bd971 (patch)
treea7c0ab3f4c2514b7983c541a1c656e73bda79aba /lib/kernel
parentbf3c918bb9df999dfb2278db6802b085d5612988 (diff)
parentf7784a0eb4e32b2950cb7360d960a936bea9db05 (diff)
downloadotp-83ba37210640e71308acec58986cfddb0c2bd971.tar.gz
otp-83ba37210640e71308acec58986cfddb0c2bd971.tar.bz2
otp-83ba37210640e71308acec58986cfddb0c2bd971.zip
Merge branch 'maint'
Conflicts: lib/sasl/test/systools_SUITE.erl
Diffstat (limited to 'lib/kernel')
0 files changed, 0 insertions, 0 deletions