diff options
author | Hans Bolinder <[email protected]> | 2013-09-12 13:12:06 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2013-09-12 13:12:06 +0200 |
commit | 2c19557ef4a09278c2bc448db1524a39e686c9e7 (patch) | |
tree | 2ac291a8fe3f138efbcf47f6f81e2dd85b9bb5d0 /erts/emulator | |
parent | 11522f343c082ac9e3ff0210f2d0f0a023a8048c (diff) | |
parent | b15d3c7cc568abfb2c7cf48cd76f1d8d503b2736 (diff) | |
download | otp-2c19557ef4a09278c2bc448db1524a39e686c9e7.tar.gz otp-2c19557ef4a09278c2bc448db1524a39e686c9e7.tar.bz2 otp-2c19557ef4a09278c2bc448db1524a39e686c9e7.zip |
Merge branch 'maint'
* maint:
Correct documentation of predefined types
crypto: Add ticket for 5d8a13bb6a180e0a
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions