diff options
| author | Björn Gustavsson <[email protected]> | 2013-08-21 12:50:04 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-08-21 12:50:13 +0200 |
| commit | 420fe40a688f88cbcd6c716cc01a5f87908bc5ee (patch) | |
| tree | 273584caa1d8004737cf04a11a4fc6059118634d /erts/emulator | |
| parent | 3cc53db7071988cd8dad0d67c85b3e08a7c6818e (diff) | |
| parent | a21db4078a7b5f23b665dc2d466541b394936cb8 (diff) | |
| download | otp-420fe40a688f88cbcd6c716cc01a5f87908bc5ee.tar.gz otp-420fe40a688f88cbcd6c716cc01a5f87908bc5ee.tar.bz2 otp-420fe40a688f88cbcd6c716cc01a5f87908bc5ee.zip | |
Merge branch 'maint-r15' into maint
Note that this is a fake merge. The bug fix changes files that
are no longer present in maint, and the bug will need to be fixed
in a different way.
* maint-r15:
Prepare release
PER, UPER: Fix encoding/decoding of open types greater than 16K
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions