diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-31 15:39:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-31 15:44:04 +0200 |
| commit | bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6 (patch) | |
| tree | 6f71224b73d11f1d7f2fb827ba82689fd60ead5a /erts/emulator/sys | |
| parent | 46332e63065f0b76e0373f77b862590760b23f85 (diff) | |
| parent | 90e0bad70affc23228e3d11d1131aba615895dd5 (diff) | |
| download | otp-bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6.tar.gz otp-bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6.tar.bz2 otp-bf9b55d9341ca6e1bbb8c1d2c2763b17538426b6.zip | |
Merge branch 'sverk/hipe-maps-merge-wrapper' into maint
* sverk/hipe-maps-merge-wrapper:
erts: Fix hipe bug for maps:merge/2
erts: Beautify hipe wrapper macro
OTP-12965
Diffstat (limited to 'erts/emulator/sys')
0 files changed, 0 insertions, 0 deletions