aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-05-18 16:22:18 +0200
committerLukas Larsson <[email protected]>2011-05-18 16:22:18 +0200
commit8ee3a1adabb3d9834e80ba121b58ba73546fe022 (patch)
treefcabce7847168a8416600fe35f94a411a5f73d6e /erts/emulator
parent15426ac367eed736c165a5bdbb1c051a87944f68 (diff)
parent20339c15f8794a1bcffa27202393a44fdbb71ab5 (diff)
downloadotp-8ee3a1adabb3d9834e80ba121b58ba73546fe022.tar.gz
otp-8ee3a1adabb3d9834e80ba121b58ba73546fe022.tar.bz2
otp-8ee3a1adabb3d9834e80ba121b58ba73546fe022.zip
Merge branch 'lukas/test_server/timetrap_factor/OTP-9320' into dev
* lukas/test_server/timetrap_factor/OTP-9320: Update ts to propigate the timetrap factor gotten from test_server:timetrap_scale_factor to common test when starting a test run.
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions