aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/Makefile
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-03-25 13:12:16 +0100
committerJohn Högberg <[email protected]>2019-03-25 13:12:16 +0100
commit54d1b47d1e845838584de9660788f2f64ad46e90 (patch)
tree2f77f9d6a56e32d09520c1ee3d580a7537a4aa3a /erts/etc/Makefile
parent11f87e326da88b9658e824832fd1dbc996f27cc3 (diff)
parent81a8b0e0674d21b3bd8f5f6ea35eefe4fcd327d9 (diff)
downloadotp-54d1b47d1e845838584de9660788f2f64ad46e90.tar.gz
otp-54d1b47d1e845838584de9660788f2f64ad46e90.tar.bz2
otp-54d1b47d1e845838584de9660788f2f64ad46e90.zip
Merge branch 'john/erts/fix-ticket-syntax-error'
* john/erts/fix-ticket-syntax-error: erts: Fix version error in erl_nif.h
Diffstat (limited to 'erts/etc/Makefile')
0 files changed, 0 insertions, 0 deletions