diff options
| author | Hans Bolinder <[email protected]> | 2017-02-03 08:50:20 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-02-03 08:50:20 +0100 |
| commit | cdeca7938c9a2cbad2575065aca3f79e2a16addd (patch) | |
| tree | 894fbc13029c8e44173d0510ecbfaf38f2eb94a7 /lib/stdlib/src/timer.erl | |
| parent | f10abe57f6d2e0bc0b46bdda8c6456ed0c72a3a9 (diff) | |
| parent | 67621f731008ff203d13e03f68edbea55b0d9054 (diff) | |
| download | otp-cdeca7938c9a2cbad2575065aca3f79e2a16addd.tar.gz otp-cdeca7938c9a2cbad2575065aca3f79e2a16addd.tar.bz2 otp-cdeca7938c9a2cbad2575065aca3f79e2a16addd.zip | |
Merge branch 'maint'
* maint:
dialyzer: Increase time limit for tests
dialyzer: Optimize typesig
dialyzer: Optimize evaluation of complex code
dialyzer: Optimize collection of variables
Conflicts:
lib/dialyzer/src/dialyzer_typesig.erl
Diffstat (limited to 'lib/stdlib/src/timer.erl')
0 files changed, 0 insertions, 0 deletions