diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-25 11:35:41 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-25 11:35:41 +0200 |
| commit | c12d2dc802df9510ae32ac37ccefeb162767774c (patch) | |
| tree | ee319edd72827c0fd7b0d8c32df59169d314bfad /lib/.gitignore | |
| parent | ca868041729863845f71b6abadc079c414c18168 (diff) | |
| parent | 279fe010040ad1e09f67a509596cf4227afe658d (diff) | |
| download | otp-c12d2dc802df9510ae32ac37ccefeb162767774c.tar.gz otp-c12d2dc802df9510ae32ac37ccefeb162767774c.tar.bz2 otp-c12d2dc802df9510ae32ac37ccefeb162767774c.zip | |
Merge branch 'richcarl/syntax_tools/add-merl'
* richcarl/syntax_tools/add-merl:
Make merl compatible with OTP 18.0
Add tests for merl in syntax_tools
Include Merl in Syntax Tools
Diffstat (limited to 'lib/.gitignore')
| -rw-r--r-- | lib/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index 4125111ebd..58c49adce0 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -546,6 +546,8 @@ snmp/doc/intex.html /syntax_tools/doc/src/erl_syntax.xml /syntax_tools/doc/src/erl_syntax_lib.xml /syntax_tools/doc/src/erl_tidy.xml +/syntax_tools/doc/src/merl.xml +/syntax_tools/doc/src/merl_transform.xml /syntax_tools/doc/src/igor.xml /syntax_tools/doc/src/prettypr.xml |