aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-07-13 13:29:34 +0200
committerRickard Green <[email protected]>2018-07-13 13:29:34 +0200
commit212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6 (patch)
treee307b4d3b7ac2f33f85ce0b795badad424c390fe /.gitignore
parent6ff0857f6385848248f38e6315881f6ffc44729f (diff)
parenta3a900e382ccba96ef15369c5771070e538b8367 (diff)
downloadotp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.tar.gz
otp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.tar.bz2
otp-212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Update release notes Update version numbers Fix trace_info/2 Provide build support for standalone corba repo Fix release notes for OTP-21.0.2 Move to a dirty scheduler even when we have pending system tasks
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 79b1d5dfad..0e9d07757f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,7 +119,9 @@ JAVADOC-GENERATED
/bootstrap/lib/common_test
/bootstrap/lib/edoc
/bootstrap/lib/erl_docgen
+/bootstrap/lib/erl_interface
/bootstrap/lib/hipe
+/bootstrap/lib/jinterface
/bootstrap/lib/parsetools
/bootstrap/lib/runtime_tools
/bootstrap/lib/sasl