aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-03-26 13:40:14 +0200
committerPeter Andersson <[email protected]>2012-03-26 13:40:20 +0200
commit67ccf96bb7b430e691509a45299eeee1ca5f27c5 (patch)
tree2f0fdf2cf41e2f39d430d17413ff6d1e9b24f819 /.gitattributes
parent22c4c386fe2a8655b1c9be09a083b89e220f1120 (diff)
parent5fd16511a1240220f0126f7be51f44aa38bcce56 (diff)
downloadotp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.tar.gz
otp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.tar.bz2
otp-67ccf96bb7b430e691509a45299eeee1ca5f27c5.zip
Merge remote branch 'origin/peppe/common_test/otp-9988_9871.merged' into maint
* origin/peppe/common_test/otp-9988_9871.merged: Fix various problems with the user timetrap implementation Fix dialyzer reported errors Implement support for user controlled timetraps OTP-9988
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions