diff options
author | Rickard Green <[email protected]> | 2016-01-22 11:11:06 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-01-22 11:11:06 +0100 |
commit | 3d99247859e1d5d1862b550cd29c44a4f4cf54e0 (patch) | |
tree | cef0b01d8cb82f5ebbbf5d206f1d8ad0feded238 /erts/emulator/Makefile | |
parent | 59d6e191aea477fdbbf2befa47ae1f612ed6ab17 (diff) | |
parent | 9293a250e02e63d295a841786f03c3e3a3f30e97 (diff) | |
download | otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.gz otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.bz2 otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.zip |
Merge branch 'rickard/test-fix' into maint
* rickard/test-fix:
Fix HL timer hard debug implementation
Fix stack alignment problem in ethread test on arm
Skip time_SUITE:timestamp on timewarp test
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions