aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-15 14:10:21 +0100
committerIngela Anderton Andin <[email protected]>2012-11-15 14:10:21 +0100
commitbdc34f0f247628bc285143f250192e4c6016c812 (patch)
treebbb910cc2eac6cc6accf845d0a92fc0145200a98 /erts/emulator
parent042c2986445465f843e5dc4be4df34b28381d0d2 (diff)
parentc91f3bb9e5f2ad93b7eeabe32bc017533ea3d940 (diff)
downloadotp-bdc34f0f247628bc285143f250192e4c6016c812.tar.gz
otp-bdc34f0f247628bc285143f250192e4c6016c812.tar.bz2
otp-bdc34f0f247628bc285143f250192e4c6016c812.zip
Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release: ssl: Update vsn.mk and ssl.appup.src for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions