diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 16:33:41 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 16:33:41 +0100 |
| commit | 7f2cd602577646e927c60cf381e88246e6ecee96 (patch) | |
| tree | e38dd5daf74c33accac48481371a2ff21ffb7d84 /erts/etc/common/heart.c | |
| parent | 219e879177f6fed78b305cbbacb39e6d0a9ffa2e (diff) | |
| parent | 195be9a44f2481b9c575c8ad286f4d2278b831b3 (diff) | |
| download | otp-7f2cd602577646e927c60cf381e88246e6ecee96.tar.gz otp-7f2cd602577646e927c60cf381e88246e6ecee96.tar.bz2 otp-7f2cd602577646e927c60cf381e88246e6ecee96.zip | |
Merge branch 'maint'
* maint:
erts: Do not profile system profiler pid
test: system_profile profiler pid is not profiled
Remove line macros in system_profile_SUITE
Diffstat (limited to 'erts/etc/common/heart.c')
0 files changed, 0 insertions, 0 deletions