diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-04 12:22:01 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-04 12:22:01 +0200 |
| commit | e5101396c86b5bcbd933f82b4ef36dcf3d9ace61 (patch) | |
| tree | 427b8a519c219e69c670eb4a6fef473538d1d324 /lib/kernel/include/file.hrl | |
| parent | e99daf3212fbc381074e5be229465e9b6269e204 (diff) | |
| parent | f0078df03af2d873b598738b9e80ceb5f6df6019 (diff) | |
| download | otp-e5101396c86b5bcbd933f82b4ef36dcf3d9ace61.tar.gz otp-e5101396c86b5bcbd933f82b4ef36dcf3d9ace61.tar.bz2 otp-e5101396c86b5bcbd933f82b4ef36dcf3d9ace61.zip | |
Merge branch 'egil/cuddle-tests'
* egil/cuddle-tests:
erts: Remove remaining ?line macros in trace_meta_SUITE
erts: Relax trace_meta_SUITE:on_and_off_test/1
erts: Remove ?line macro in trace_meta_SUITE:on_and_off_test/1
kernel: Remove remaining ?line macros in gen_tcp_misc_SUITE
kernel: Relax gen_tcp_misc_SUITE don't wait for timeout
kernel: Relax test gen_tcp_misc_SUITE:wrapping_oct/1
Diffstat (limited to 'lib/kernel/include/file.hrl')
0 files changed, 0 insertions, 0 deletions