diff options
| author | Sverker Eriksson <[email protected]> | 2016-02-24 17:55:04 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-02-24 17:55:04 +0100 |
| commit | 03743cd4193a2ca97f9b9a52a25e63f616e8fc07 (patch) | |
| tree | 9c1f4094a2105ec4bf19dd0d16e76b598d0e608d /.gitignore | |
| parent | 1b094d72ffc56069c72f17c7edd673dbbfe47e39 (diff) | |
| parent | 35739bd06776f90526006486b3f4ab7e54f7f951 (diff) | |
| download | otp-03743cd4193a2ca97f9b9a52a25e63f616e8fc07.tar.gz otp-03743cd4193a2ca97f9b9a52a25e63f616e8fc07.tar.bz2 otp-03743cd4193a2ca97f9b9a52a25e63f616e8fc07.zip | |
Merge branch 'master' into sverk/master/halt-INT_MIN
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index e27b5b12ff..3dcfa79f4d 100644 --- a/.gitignore +++ b/.gitignore @@ -182,7 +182,6 @@ JAVADOC-GENERATED # Files generated by configure. # -/lib/*/configure /lib/*/config.log /lib/*/config.status @@ -190,6 +189,8 @@ JAVADOC-GENERATED # Files generated by "./otp_build autoconf" # +/lib/*/configure +/lib/common_test/test_server/configure /lib/configure.in /aclocal.m4 /lib/common_test/priv/auxdir/config.guess @@ -201,9 +202,9 @@ JAVADOC-GENERATED /lib/erl_interface/src/auxdir/install-sh /lib/megaco/aclocal.m4 /lib/odbc/aclocal.m4 -/lib/test_server/src/config.guess -/lib/test_server/src/config.sub -/lib/test_server/src/install-sh +/lib/common_test/test_server/config.guess +/lib/common_test/test_server/config.sub +/lib/common_test/test_server/install-sh /lib/wx/aclocal.m4 /lib/wx/autoconf/config.guess /lib/wx/autoconf/config.sub |