aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/Makefile
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2011-12-22 15:49:46 +0100
committerRaimo Niskanen <[email protected]>2011-12-22 15:49:46 +0100
commit8769a849dbbb70cb92733f484b2a0e1693e97eb7 (patch)
tree655311e1cf96a7bc7f518a90eb559ea336cc4dff /erts/emulator/test/Makefile
parentc2743754c9189e66a3a70248703118d8e61b7701 (diff)
parentfed610860ce79634e3a221a1f86e8382dee1088c (diff)
downloadotp-8769a849dbbb70cb92733f484b2a0e1693e97eb7.tar.gz
otp-8769a849dbbb70cb92733f484b2a0e1693e97eb7.tar.bz2
otp-8769a849dbbb70cb92733f484b2a0e1693e97eb7.zip
Merge branch 'raimo/opu-fixes' into maint
* raimo/opu-fixes: inet_res_SUITE: Go back to old way to kill test name server
Diffstat (limited to 'erts/emulator/test/Makefile')
0 files changed, 0 insertions, 0 deletions