aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-09-14 14:51:28 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-09-14 14:51:28 +0200
commite79bf1e498c3f6dee1ad4199fdc158d1057bf329 (patch)
tree404b633131a9fa442819444dec017320494f446d
parent356338ad69008558cc2be1bd57fe6caa10c04fe1 (diff)
parentc604c47c2ac749d0b60f86481d5b20ef359f23d6 (diff)
downloadotp-e79bf1e498c3f6dee1ad4199fdc158d1057bf329.tar.gz
otp-e79bf1e498c3f6dee1ad4199fdc158d1057bf329.tar.bz2
otp-e79bf1e498c3f6dee1ad4199fdc158d1057bf329.zip
Merge branch 'egil/update-gitignore' into maint
* egil/update-gitignore: Update .gitignore
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3fc95170aa..71350ca1b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,6 +143,7 @@ JAVADOC-GENERATED
/make/output.mk
/make/emd2exml
+/make/make_emakefile
# Created by "out_build update_primary"
/bootstrap/primary_compiler/