aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-06-12 10:48:05 +0200
committerSverker Eriksson <[email protected]>2013-06-12 10:48:05 +0200
commit1f8d9f43766fea0e706db8923075ab65a7677daf (patch)
tree91de81d0594c528c17e2e6e1dfaacbb85145017f /erts/emulator
parent5dd13b1efead2a8101ff1fb46937fbfa00db5269 (diff)
parent6b1147bd90960772257e12ab6fa66ec9aaacc48a (diff)
downloadotp-1f8d9f43766fea0e706db8923075ab65a7677daf.tar.gz
otp-1f8d9f43766fea0e706db8923075ab65a7677daf.tar.bz2
otp-1f8d9f43766fea0e706db8923075ab65a7677daf.zip
Merge branch 'sverk/crypto-upgrade-resource-bug' into maint
* sverk/crypto-upgrade-resource-bug: crypto: Fix bug with takover of EC resource type
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions