diff options
| author | Lukas Larsson <[email protected]> | 2012-06-04 11:51:03 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-06-04 11:59:03 +0200 |
| commit | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (patch) | |
| tree | 23385b33daa358eaf0a7dc290257f82207d412c9 /README.md.txt | |
| parent | 868f5446c1f133cc29fc2ef274697460886374c6 (diff) | |
| parent | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (diff) | |
| download | otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.gz otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.tar.bz2 otp-0374be0e7caf06a9d1af3daef2cea1f7b20a57ab.zip | |
Merge branch 'maint'
* maint:
Remove stale code for hybrid heap and incremental GC
Remove the hipe_bifs:show_message_area/0 BIF
Remove support for erlang:system_info(global_heaps_size)
Remove the erlang:garbage_collect_message_area/0 BIF
Remove workarounds for hybrid and shared heaps in test suites
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_message.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
erts/emulator/hipe/hipe_bif2.tab
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'README.md.txt')
0 files changed, 0 insertions, 0 deletions