diff options
| author | Hans Nilsson <[email protected]> | 2014-10-08 18:25:31 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-10-08 18:25:31 +0200 |
| commit | 98082ac2e138619671bc895d548cfdc52bb0e213 (patch) | |
| tree | 5142e9a876bf6daaa06d4e41519c5e4da815355a /.gitignore | |
| parent | 0680644cec853e23266bb70d4e39a32baa4362f0 (diff) | |
| parent | 1aa1a4f6173e9ef59ac0b6bb054368c141000062 (diff) | |
| download | otp-98082ac2e138619671bc895d548cfdc52bb0e213.tar.gz otp-98082ac2e138619671bc895d548cfdc52bb0e213.tar.bz2 otp-98082ac2e138619671bc895d548cfdc52bb0e213.zip | |
Merge branch 'maint'
* maint:
ct: .gitignore ct_property_test.xml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d40f49b56f..eb14036789 100644 --- a/.gitignore +++ b/.gitignore @@ -208,6 +208,7 @@ JAVADOC-GENERATED # common_test +/lib/common_test/doc/src/ct_property_test.xml /lib/common_test/doc/src/ct_slave.xml /lib/common_test/priv/install.sh |