diff options
author | Björn Gustavsson <[email protected]> | 2012-02-13 16:09:10 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-02-13 16:09:10 +0100 |
commit | c58d64db07921970e539f346dc65f13d5f3bc975 (patch) | |
tree | 6749ef8d5ce94653700184b569c4d806f91c41a2 /erts/emulator | |
parent | 86231a380b27fc262e48aa8c3f0372d4d2056682 (diff) | |
parent | 5fad4a37f440739b8cb6d2a11e89bf3b825c6f97 (diff) | |
download | otp-c58d64db07921970e539f346dc65f13d5f3bc975.tar.gz otp-c58d64db07921970e539f346dc65f13d5f3bc975.tar.bz2 otp-c58d64db07921970e539f346dc65f13d5f3bc975.zip |
Merge branch 'bjorn/makefiles' into maint
* bjorn/makefiles:
Include the xmerl include files in the bootstrap
Teach lib/Makefile to build applications listed in EXTRA-APPLICATIONS
Clean up lib/Makefile
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions