aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-09-14 10:16:56 +0200
committerBjörn Gustavsson <[email protected]>2016-09-14 10:16:56 +0200
commit176b7c94e4146a65ccd2bd729d58487098dddd9c (patch)
tree867a8e75f85b39356b1769362d0e793cba5562de /erts/emulator
parentbe7d979dc3634cd38df48d23016d80cd4172606e (diff)
parentde8fe86f67591dd992bae33f7451523dab36e5bd (diff)
downloadotp-176b7c94e4146a65ccd2bd729d58487098dddd9c.tar.gz
otp-176b7c94e4146a65ccd2bd729d58487098dddd9c.tar.bz2
otp-176b7c94e4146a65ccd2bd729d58487098dddd9c.zip
Merge branch 'bjorn/erts/start-scripts/ERL-250' into maint
* bjorn/erts/start-scripts/ERL-250: Turn off parallel make for start scripts Makefile
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions