diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-01-24 10:05:16 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-24 10:05:16 +0100 |
| commit | 2e76cc5e704bee90f114824019253be5f33766af (patch) | |
| tree | fecc03d68bbec272c565dd7b1bf845dfe60dec7b /erts/emulator/Makefile | |
| parent | 7e6ac31a0c918f42e747628db8fec610f5bd424c (diff) | |
| parent | 9de54765058c78d77f1b6a900fa70a68b0f6f987 (diff) | |
| download | otp-2e76cc5e704bee90f114824019253be5f33766af.tar.gz otp-2e76cc5e704bee90f114824019253be5f33766af.tar.bz2 otp-2e76cc5e704bee90f114824019253be5f33766af.zip | |
Merge branch 'egil/fix-profiler-pid' into maint
* egil/fix-profiler-pid:
erts: Do not profile profiler pid (non smp)
erts: Do not profile profiler pid (smp)
Revert "erts: Do not profile system profiler pid"
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions