aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-11-02 09:20:21 +0100
committerHans Bolinder <[email protected]>2016-11-02 09:20:21 +0100
commit0a07cf6a655318245f57ef2ea89d0f3b2b8118e9 (patch)
tree82d14e6ee8d150e9668cbb600a5f047be9755c06 /.gitattributes
parent02d95710d58e3f8e7e6bcfe51eededac3dc0bc27 (diff)
parentb8fee0165c0fd510aebde6445833052dba8f7ece (diff)
downloadotp-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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions