aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/Makefile
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-07-10 10:11:18 +0200
committerJohn Högberg <[email protected]>2019-07-10 10:11:18 +0200
commit0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56 (patch)
treebc2fd46c12b1f07ea73f02fad93102a1cf67a2d5 /lib/kernel/Makefile
parentbb4955e083e34be40a9e0d5c0831e5b1498d11df (diff)
parent4e9792256a754ff10f6a214f582fbb58e081deb2 (diff)
downloadotp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.tar.gz
otp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.tar.bz2
otp-0ba1c8db3f593736cdffb1f7d4c45ea276ad6d56.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions