diff options
| author | Lukas Larsson <[email protected]> | 2013-09-02 16:14:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-02 16:21:24 +0200 |
| commit | b5a8aefd0bfa04ea770a9ec869cd079c37278629 (patch) | |
| tree | a9f147de95550488056810342176c891253e93e6 /.gitignore | |
| parent | e946b152f3b8c5a31b3096a733c6387d9681f0c5 (diff) | |
| parent | 1477aa1a8b78a806ae6b815e16776a64cf6fbc6e (diff) | |
| download | otp-b5a8aefd0bfa04ea770a9ec869cd079c37278629.tar.gz otp-b5a8aefd0bfa04ea770a9ec869cd079c37278629.tar.bz2 otp-b5a8aefd0bfa04ea770a9ec869cd079c37278629.zip | |
Merge branch 'maint'
* maint:
Refactor and change EXTRA_APPLICATIONS to use ls
Add configure option --without-$app
Conflicts:
HOWTO/INSTALL.md
lib/Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7ccedd3ff3..9cd91245f5 100644 --- a/.gitignore +++ b/.gitignore @@ -150,6 +150,7 @@ JAVADOC-GENERATED /erts/epmd/test/Emakefile /lib/*/SKIP +/lib/SKIP-APPLICATIONS /lib/*/doc/html/*.html /lib/*/doc/html/*.css |