diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 16:32:08 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 16:32:08 +0200 |
| commit | 00f92e552cb62233ad9dec788f4826b3e1dab4f7 (patch) | |
| tree | 2d55e4b3ab15953ae0f9a8443ca95d067cb852a7 /erts/emulator/test/Makefile | |
| parent | aae5a947a0c1c6dc6881cf9e5d81b7363055a04d (diff) | |
| parent | 549428e11f1d9b4d61135a36fc9ab594c5512d6b (diff) | |
| download | otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.tar.gz otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.tar.bz2 otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.zip | |
Merge branch 'egil/cuddle-tests'
* egil/cuddle-tests:
kernel: Remove ?line macros in inet_SUITE:t_gethostbyaddr/1
erts: Tweak statistics_SUITE:scheduler_wall_time/1
Diffstat (limited to 'erts/emulator/test/Makefile')
0 files changed, 0 insertions, 0 deletions