aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-12-09 09:13:06 +0100
committerIngela Anderton Andin <[email protected]>2011-12-09 09:13:06 +0100
commit2d48e2ed0565c5e3f6979e3abc4299e4a9994d20 (patch)
treebf9b3d415b46ea777c53e2cc942cd0c374d384af /erts/emulator
parent1fc974da091f24ef2e10ff3d293ab88cd48a3755 (diff)
parentb61df764e078ba916f16abf633f44b89cffb69cc (diff)
downloadotp-2d48e2ed0565c5e3f6979e3abc4299e4a9994d20.tar.gz
otp-2d48e2ed0565c5e3f6979e3abc4299e4a9994d20.tar.bz2
otp-2d48e2ed0565c5e3f6979e3abc4299e4a9994d20.zip
Merge branch 'ia/ssh/behaviour/OTP-9796'
* ia/ssh/behaviour/OTP-9796: Use new directive "-callback" and prepare version and appup for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions