diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
| commit | 1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (patch) | |
| tree | 91dc0be43abc7b533f4850fa21b1ec1f9e9e5bb4 /erts/emulator/sys | |
| parent | 1ccd23bb49fddec2ac21859e518a1568cd494b93 (diff) | |
| parent | e550cd4842f4bd9d2555fceb47ec3064e0037372 (diff) | |
| download | otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.gz otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.bz2 otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.zip | |
Merge branch 'rickard/frmptr' into maint
* rickard/frmptr:
Add 'frmptr' emulator type
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/sys')
0 files changed, 0 insertions, 0 deletions