diff options
author | Henrik Nord <[email protected]> | 2011-04-28 16:16:18 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-04-28 16:16:18 +0200 |
commit | 3e815447cafbcb704bac1fac3d195e94def7080f (patch) | |
tree | fe612563f6f2afe49d1cfb0d1cf6cda42fc21caa /lib/test_server/src/test_server_sup.erl | |
parent | ad782e7f082aa25593346268be5b19b35db2a5ec (diff) | |
parent | 44465b1cacf085d4c0d2f64aec3d54fcca361495 (diff) | |
download | otp-3e815447cafbcb704bac1fac3d195e94def7080f.tar.gz otp-3e815447cafbcb704bac1fac3d195e94def7080f.tar.bz2 otp-3e815447cafbcb704bac1fac3d195e94def7080f.zip |
Merge branch 'ta/common_test-ignore-ct_slave-xml' into dev
* ta/common_test-ignore-ct_slave-xml:
Ignore lib/common_test/doc/src/ct_slave.xml
Diffstat (limited to 'lib/test_server/src/test_server_sup.erl')
0 files changed, 0 insertions, 0 deletions