diff options
author | Björn Gustavsson <[email protected]> | 2012-02-16 15:37:26 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-02-16 15:37:26 +0100 |
commit | 5abac56e443827f755d079873623f42aa74b551e (patch) | |
tree | a69b8bebd033cd64bf63808febb1b7d147e2ab72 /erts/emulator/Makefile | |
parent | 554dfc97279f027bcf061f6e303e61a7cd21ffdd (diff) | |
parent | 102c34e414f573081a93ca49162dd78cf91949b7 (diff) | |
download | otp-5abac56e443827f755d079873623f42aa74b551e.tar.gz otp-5abac56e443827f755d079873623f42aa74b551e.tar.bz2 otp-5abac56e443827f755d079873623f42aa74b551e.zip |
Merge branch 'maint'
* maint:
Update primary bootstrap
Change test to use CT Config PrivDir
Fix to integer and sequence definitions
compiler: Teach the inliner to preserve on_load functions
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions