aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-05-26 14:50:58 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-05-26 14:50:58 +0200
commitaf51a9165b53cbbeae7428630299f82f0271dae0 (patch)
tree12af6411db88f00f2e8a6e8973af03361f22b81a /lib/Makefile
parente723a70dca8be27d67ded0c1cddae671d0867c3e (diff)
parent5cf8e2c92d4856dd83bef94cc0a85bba96a5a3de (diff)
downloadotp-af51a9165b53cbbeae7428630299f82f0271dae0.tar.gz
otp-af51a9165b53cbbeae7428630299f82f0271dae0.tar.bz2
otp-af51a9165b53cbbeae7428630299f82f0271dae0.zip
Merge branch 'egil/cuddle-tests'
* egil/cuddle-tests: erts: Relax monitor_SUITE:mixer/1 erts: Refactor monitor_SUITE:mixer/1 stdlib: Minor change of unicode_SUITE stdlib: Relax iterations in binary_module_SUITE:random_ref_sr_comp/1 Remove ?line macro in binary_module_SUITE:random_ref_sr_comp/1 stdlib: Relax iterations in binary_module_SUITE:random_ref_comp/1 stdlib: Remove ?line macro in binary_module_SUITE:random_ref_comp/1 stdlib: Relax filesize of io_proto_SUITE:unicode_options_gen/1 stdlib: Relax rand_SUITE timeout debugger: Relax test map_SUITE:t_guard_receive_large/1 tools: Relax lcnt test time stdlib: ets_SUITE cuddling
Diffstat (limited to 'lib/Makefile')
0 files changed, 0 insertions, 0 deletions