aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-22 14:28:44 +0100
committerIngela Anderton Andin <[email protected]>2013-01-22 14:28:44 +0100
commiteda5f7771a06a17be033e2fcae3703b4a9ab462d (patch)
tree3a76bc00c5406795d7b011b7199a8f4a15571843 /erts
parent9b01d9553434256b93b4899caf042d857f6ef068 (diff)
parent408759b0f509c90a04f4712a8e9cbff6ebb2205b (diff)
downloadotp-eda5f7771a06a17be033e2fcae3703b4a9ab462d.tar.gz
otp-eda5f7771a06a17be033e2fcae3703b4a9ab462d.tar.bz2
otp-eda5f7771a06a17be033e2fcae3703b4a9ab462d.zip
Merge branch 'ia/public_key/prepare-for-release'
* ia/public_key/prepare-for-release: public_key: Prepare for R16
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions