aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-09-01 10:59:38 +0200
committerSiri Hansen <[email protected]>2014-09-01 10:59:38 +0200
commit847c28ea7dfdc0a33f6baf9a6450d2902d586938 (patch)
tree0b5ffec2158bd472321aa4fb325a290ea5f965a0 /erts/emulator
parent48f7c246fa044a5a995e3b8efcb10face0b2b201 (diff)
parentef8a7ce274a62d9069fa3d1a8b597635b83f5078 (diff)
downloadotp-847c28ea7dfdc0a33f6baf9a6450d2902d586938.tar.gz
otp-847c28ea7dfdc0a33f6baf9a6450d2902d586938.tar.bz2
otp-847c28ea7dfdc0a33f6baf9a6450d2902d586938.zip
Merge branch 'siri/ct-runtime-deps/OTP-12037' into maint
* siri/ct-runtime-deps/OTP-12037: [ct] Update runtime dependencies towards test_server
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions