aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-04-19 12:00:03 +0200
committerSiri Hansen <[email protected]>2018-04-19 12:00:03 +0200
commit747e027b085c0569088f12999824dcce63be0935 (patch)
tree35e2012bc4afe7927a2d825df33d16235fa27528 /lib/ic
parent05f59a5f1c80074b35c48a7baff84df6bdf48c28 (diff)
parentf15f615f9185077b02c011ac28257e8365c01e75 (diff)
downloadotp-747e027b085c0569088f12999824dcce63be0935.tar.gz
otp-747e027b085c0569088f12999824dcce63be0935.tar.bz2
otp-747e027b085c0569088f12999824dcce63be0935.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Update appup file for sasl Fix bug in hybrid boot file used for restart_new_emulator Conflicts: OTP_VERSION lib/sasl/src/sasl.appup.src
Diffstat (limited to 'lib/ic')
0 files changed, 0 insertions, 0 deletions