aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-11-15 10:49:40 +0100
committerIngela Anderton Andin <[email protected]>2011-11-15 10:49:40 +0100
commit45305535f3348d8ea9a637b2236fd079e147971c (patch)
tree5c7f7cd7ff7703ca200d43b7a94d50d7d970ab86 /erts/emulator
parent96890a04beaa831ac10a2c30e595acbaf0823dc4 (diff)
parentc8c5ea1f4bd44bf265e4687a5c730abf57683d9a (diff)
downloadotp-45305535f3348d8ea9a637b2236fd079e147971c.tar.gz
otp-45305535f3348d8ea9a637b2236fd079e147971c.tar.bz2
otp-45305535f3348d8ea9a637b2236fd079e147971c.zip
Merge branch 'ia/ssl/prepare-for-relese'
* ia/ssl/prepare-for-relese: Prepare version and appup for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions