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 | |
| 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
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 409be555fb..b35a6c1c31 100644 --- a/.gitignore +++ b/.gitignore @@ -179,6 +179,7 @@ make/win32/ # common_test +/lib/common_test/doc/src/ct_slave.xml /lib/common_test/priv/install.sh # compiler |