aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-01-18 14:36:23 +0100
committerBjörn-Egil Dahlberg <[email protected]>2013-01-18 14:36:23 +0100
commitb0e4f20f2abde9fc264995317966f373775e2b2b (patch)
treec2ded39c850156a1aafbc69fa1bc48ba08101922 /.gitignore
parent40e7a6da2054b9c430360bd5dd656b1d43f6c6ef (diff)
parentfed9a8415fc77ed42bf9a94ea421eff4f62c5eb4 (diff)
downloadotp-b0e4f20f2abde9fc264995317966f373775e2b2b.tar.gz
otp-b0e4f20f2abde9fc264995317966f373775e2b2b.tar.bz2
otp-b0e4f20f2abde9fc264995317966f373775e2b2b.zip
Merge branch 'nox/enable-silent-rules/OTP-10726'
* nox/enable-silent-rules/OTP-10726: Implement ./otp_build configure --enable-silent-rules
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9dbe9cbcb7..e5e74f9a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@ JAVADOC-GENERATED
/release
+/make/output.mk
/make/emd2exml
# Created by "out_build update_primary"