diff options
| author | Lukas Larsson <[email protected]> | 2012-07-17 14:15:35 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-07-17 14:15:35 +0200 |
| commit | 045b634dd609a16ffb8d56b11e63ed9e36be2480 (patch) | |
| tree | 95f4531718615517b086cd64ff4d607f46647e7e /make/otp.mk.in | |
| parent | d14b426aa892a891ba2b911dff923e440a643870 (diff) | |
| parent | f3528e0a5ecb2f655f9d2e5de996424defcdf1c9 (diff) | |
| download | otp-045b634dd609a16ffb8d56b11e63ed9e36be2480.tar.gz otp-045b634dd609a16ffb8d56b11e63ed9e36be2480.tar.bz2 otp-045b634dd609a16ffb8d56b11e63ed9e36be2480.zip | |
Merge branch 'maint'
* maint:
erts: add space before '*' in some function prototypes
ic: add space before '*' in some function prototypes
Fix a bug regarding spaces in C function prototypes
Update preloaded
Add tests for problems with handling of primary archive
Add comments to make erl_prim_loader primary archive handling more readable
Fix erl_prim_loader errors in handling of primary archive
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to 'make/otp.mk.in')
0 files changed, 0 insertions, 0 deletions