aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-04-01 15:31:14 +0200
committerSverker Eriksson <[email protected]>2011-04-01 15:31:14 +0200
commit14adb5f5cd8148ef251157a39fdc4a99530bb1d1 (patch)
tree6a769d07862ee4bbb15eba3da3cf0aac932b24c5 /erts/epmd
parent745c4af40595c8b029c2d61ddbe22c6d12950236 (diff)
parentb3c59c7ba43cf2fdaf0af9e4da189d68df62fd33 (diff)
downloadotp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.tar.gz
otp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.tar.bz2
otp-14adb5f5cd8148ef251157a39fdc4a99530bb1d1.zip
Merge branch 'sverker/config-hipe-halfword-prevent' into dev
* sverker/config-hipe-halfword-prevent: Prevent configuration of hipe and halfword emulator together
Diffstat (limited to 'erts/epmd')
0 files changed, 0 insertions, 0 deletions