diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-09-14 14:52:00 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-09-14 14:52:00 +0200 |
| commit | aae6971716bc826e23ac72263aee95683cea702b (patch) | |
| tree | 0e1fb1ca951342ec7681be3c12dad0f885234f4c | |
| parent | 8ba70d0bdb2ee8718801bac0ca91f4aaac73a36b (diff) | |
| parent | e79bf1e498c3f6dee1ad4199fdc158d1057bf329 (diff) | |
| download | otp-aae6971716bc826e23ac72263aee95683cea702b.tar.gz otp-aae6971716bc826e23ac72263aee95683cea702b.tar.bz2 otp-aae6971716bc826e23ac72263aee95683cea702b.zip | |
Merge branch 'maint'
* maint:
Update .gitignore
| -rw-r--r-- | .gitignore | 1 |
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/ |