diff options
| author | Peter Andersson <[email protected]> | 2012-08-23 16:50:52 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-23 16:50:52 +0200 |
| commit | c8969d42acbdff2c65f48a27dcd1cb36b15d4b87 (patch) | |
| tree | efbabc7344c7622e6230f765c59dd7cae33ab45e /lib/os_mon/test/Makefile | |
| parent | 182564757661d6cd507d2e92d175c61602a25394 (diff) | |
| parent | c41fbd49054693d61f9f78ef92da176aeea3bf83 (diff) | |
| download | otp-c8969d42acbdff2c65f48a27dcd1cb36b15d4b87.tar.gz otp-c8969d42acbdff2c65f48a27dcd1cb36b15d4b87.tar.bz2 otp-c8969d42acbdff2c65f48a27dcd1cb36b15d4b87.zip | |
Merge remote branch 'origin/peppe/common_test/break_and_continue' into maint
* origin/peppe/common_test/break_and_continue:
Fix error in documentation
Implement support for test case execution break/continue
Conflicts:
lib/common_test/src/ct.erl
lib/common_test/src/ct_run.erl
OTP-10127
OTP-10172
Diffstat (limited to 'lib/os_mon/test/Makefile')
0 files changed, 0 insertions, 0 deletions