diff options
| author | Rickard Green <[email protected]> | 2018-07-13 13:29:34 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-07-13 13:29:34 +0200 |
| commit | 212e8b4caa9968d50f0701ce70aa0ebe5b25f1a6 (patch) | |
| tree | e307b4d3b7ac2f33f85ce0b795badad424c390fe /lib | |
| parent | 6ff0857f6385848248f38e6315881f6ffc44729f (diff) | |
| parent | a3a900e382ccba96ef15369c5771070e538b8367 (diff) | |
| download | otp-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 'lib')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index 0053238826..cdb3f3f3dc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -58,7 +58,7 @@ else SUB_DIRECTORIES = hipe parsetools asn1/src else ifdef TERTIARY_BOOTSTRAP - SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx + SUB_DIRECTORIES = snmp sasl jinterface syntax_tools wx else ifdef DOC_BOOTSTRAP SUB_DIRECTORIES = xmerl edoc erl_docgen |