aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server_ctrl.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-08-23 16:07:23 +0200
committerPeter Andersson <[email protected]>2012-08-23 16:08:16 +0200
commit4173064b7044d72f650cf459683793acc9e29352 (patch)
treed0def2875976ba6fcf2cf9e2775ade845ad5cace /lib/test_server/src/test_server_ctrl.erl
parent474e2e4485eaf6da0b325ad7c7e79b29fac262b7 (diff)
parentecf119feda32c0692bf688462ced24efa35789f1 (diff)
downloadotp-4173064b7044d72f650cf459683793acc9e29352.tar.gz
otp-4173064b7044d72f650cf459683793acc9e29352.tar.bz2
otp-4173064b7044d72f650cf459683793acc9e29352.zip
Merge remote branch 'origin/peppe/common_test/testspec_updates' into maint
* origin/peppe/common_test/testspec_updates: Test new testspec functionality and correct bugs Implement constants and new features for test specifications Conflicts: lib/common_test/src/ct_run.erl lib/common_test/test/Makefile OTP-10049 OTP-10089 OTP-10145
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
0 files changed, 0 insertions, 0 deletions