diff options
| author | Rickard Green <[email protected]> | 2017-01-11 17:01:54 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-11 17:01:54 +0100 |
| commit | 1ef677d76350ec14050a292fda47657f238fc496 (patch) | |
| tree | f6ac520b9311a04028127ec03ef2d92625df3bd2 /lib/stdlib/include | |
| parent | 16da88810cc3dccb0d67b7d1bd97874cadf1bc7b (diff) | |
| parent | ad8229b57c8dcd8ff129398b53e3b81849daecc7 (diff) | |
| download | otp-1ef677d76350ec14050a292fda47657f238fc496.tar.gz otp-1ef677d76350ec14050a292fda47657f238fc496.tar.bz2 otp-1ef677d76350ec14050a292fda47657f238fc496.zip | |
Merge branch 'maint'
* maint:
Fix call_time trace for NIFs
Conflicts:
erts/emulator/beam/beam_emu.c
Diffstat (limited to 'lib/stdlib/include')
0 files changed, 0 insertions, 0 deletions