aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-23 15:11:06 +0200
committerPeter Andersson <[email protected]>2012-08-23 15:15:46 +0200
commit55a885431333e263228e069c2aa7d56ec8e2b25c (patch)
tree4b4a0e4cbb0cd5170e075fefb392eeab9516f3a7 /erts
parentdb5288a7ee4a60aff143f65b90a2bebcbe1bf15d (diff)
parente711632042d1538fce80d565a2add309a88efa1b (diff)
downloadotp-55a885431333e263228e069c2aa7d56ec8e2b25c.tar.gz
otp-55a885431333e263228e069c2aa7d56ec8e2b25c.tar.bz2
otp-55a885431333e263228e069c2aa7d56ec8e2b25c.zip
Merge remote branch 'origin/peppe/common_test/ct_hooks_errors' into maint
* origin/peppe/common_test/ct_hooks_errors: Fix IO printout crash caused by hook function Fix timetrap error in pre-hooks Conflicts: lib/common_test/src/cth_surefire.erl OTP-10050 OTP-10069 OTP-10072
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions