diff options
| author | Hans Bolinder <[email protected]> | 2016-11-02 09:20:21 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-11-02 09:20:21 +0100 |
| commit | 0a07cf6a655318245f57ef2ea89d0f3b2b8118e9 (patch) | |
| tree | 82d14e6ee8d150e9668cbb600a5f047be9755c06 /LICENSE.txt | |
| parent | 02d95710d58e3f8e7e6bcfe51eededac3dc0bc27 (diff) | |
| parent | b8fee0165c0fd510aebde6445833052dba8f7ece (diff) | |
| download | otp-0a07cf6a655318245f57ef2ea89d0f3b2b8118e9.tar.gz otp-0a07cf6a655318245f57ef2ea89d0f3b2b8118e9.tar.bz2 otp-0a07cf6a655318245f57ef2ea89d0f3b2b8118e9.zip | |
Merge branch 'maint'
* maint:
Update preloaded
erts: Correct type declaration of match specification head
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions