diff options
| author | Björn Gustavsson <[email protected]> | 2015-02-03 08:13:35 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-02-03 08:13:35 +0100 |
| commit | c8bbf52191e3c87eedde061051eebcd02dbb7fd5 (patch) | |
| tree | 79d5b18ff06548c6b42f969dd3c93a2998c7ad52 /erts/emulator/Makefile | |
| parent | 92a0424a0ece205072516e97086b5986986dca37 (diff) | |
| parent | 0fee86f864a4ba2a7a363927a50c81c43994ca9a (diff) | |
| download | otp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.tar.gz otp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.tar.bz2 otp-c8bbf52191e3c87eedde061051eebcd02dbb7fd5.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
Be more careful about map patterns when evalutating element/2
Do not convert map patterns to map expressions
Conflicts:
bootstrap/lib/compiler/ebin/sys_core_fold.beam
lib/compiler/test/match_SUITE.erl
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions