aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2011-05-13 14:12:36 +0200
committerHans Bolinder <[email protected]>2011-05-13 14:12:36 +0200
commit6f6f9e1a6fd96efd86673855cbdcd316c445c753 (patch)
treec97db2bb992a930fa6056002ed424b70f333ab01 /.gitattributes
parent0ccc57b1e3772deaf5650077808a38a52b1133b9 (diff)
parentb8f38a71e2c7768b6af6fd877f9bf5ceb0dbbaef (diff)
downloadotp-6f6f9e1a6fd96efd86673855cbdcd316c445c753.tar.gz
otp-6f6f9e1a6fd96efd86673855cbdcd316c445c753.tar.bz2
otp-6f6f9e1a6fd96efd86673855cbdcd316c445c753.zip
Merge branch 'hb/stdlib/dets_tablenames/OTP-9282' into dev
* hb/stdlib/dets_tablenames/OTP-9282: Allow Dets tablenames to be arbitrary terms Conflicts: lib/stdlib/src/dets.erl
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions