aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-23 16:38:19 +0200
committerPeter Andersson <[email protected]>2012-08-23 16:38:19 +0200
commit182564757661d6cd507d2e92d175c61602a25394 (patch)
treed64c68c681706dba93d1ce6ab16998419b57d184 /Makefile.in
parent4173064b7044d72f650cf459683793acc9e29352 (diff)
parentb337ca6109902c4713016d2ab366c0bfb6cc1a2e (diff)
downloadotp-182564757661d6cd507d2e92d175c61602a25394.tar.gz
otp-182564757661d6cd507d2e92d175c61602a25394.tar.bz2
otp-182564757661d6cd507d2e92d175c61602a25394.zip
Merge remote branch 'origin/peppe/common_test/verbosity_level' into maint
* origin/peppe/common_test/verbosity_level: Fix doc build error Implement verbosity levels and parameter for log printout importance Conflicts: lib/common_test/src/ct_logs.erl lib/common_test/src/ct_run.erl lib/common_test/src/ct_testspec.erl lib/common_test/src/ct_util.hrl lib/common_test/test/Makefile OTP-9625 OTP-10067
Diffstat (limited to 'Makefile.in')
0 files changed, 0 insertions, 0 deletions