diff options
| author | Hans Nilsson <[email protected]> | 2018-10-30 12:11:11 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-10-30 12:11:11 +0100 |
| commit | a03b0b0298208216481fdc2a373e5cda893535d2 (patch) | |
| tree | 9fe59060a40e63f4385c165d0b0da5d3ea9b23f9 /erts | |
| parent | 47433ac7a42651406b3f757af2ff2c5d2211a1a5 (diff) | |
| parent | 3094642858ec071f9e98cfa666b82e06648b5266 (diff) | |
| download | otp-a03b0b0298208216481fdc2a373e5cda893535d2.tar.gz otp-a03b0b0298208216481fdc2a373e5cda893535d2.tar.bz2 otp-a03b0b0298208216481fdc2a373e5cda893535d2.zip | |
Merge branch 'maint'
* maint:
fix extra parameter in <type>
Update profiling.xml
Fix docs on gen_event optional callback
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions