aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-09-11 10:32:13 +0200
committerMarcus Arendt <[email protected]>2014-09-11 10:32:13 +0200
commit0abec7199fcf362f139aef6976e00921c67b2d51 (patch)
tree8fbc77cc268622eb7d88b56a8eb2b39a33453774 /.gitattributes
parent08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8 (diff)
parent3c248c14a0f5eeab25a38e550e672e074affb79e (diff)
downloadotp-0abec7199fcf362f139aef6976e00921c67b2d51.tar.gz
otp-0abec7199fcf362f139aef6976e00921c67b2d51.tar.bz2
otp-0abec7199fcf362f139aef6976e00921c67b2d51.zip
Merge branch 'maint'
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions