aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-05 12:35:40 +0100
committerMicael Karlberg <[email protected]>2012-01-05 12:35:40 +0100
commitb1d6a39529229a98ce57f2121cbe080702e82adc (patch)
tree0ee418b0af3052590a893247888b1dc3cadc197e /.gitattributes
parentbe7a927e000c0b772fefa43343b7a14d9070d871 (diff)
parent5edcd0d6372d73124e4160a2bbc5b81853642fc5 (diff)
downloadotp-b1d6a39529229a98ce57f2121cbe080702e82adc.tar.gz
otp-b1d6a39529229a98ce57f2121cbe080702e82adc.tar.bz2
otp-b1d6a39529229a98ce57f2121cbe080702e82adc.zip
Merge branch 'bmk/inets/httpc/bad_keep_alive_mode/r14/OTP-9847' into bmk/inets/inets573_integration
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions