diff options
| author | Dan Gudmundsson <[email protected]> | 2016-05-20 09:19:54 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-05-20 09:19:54 +0200 |
| commit | a02721920321d999a79dfd81494186b3ab3d3d81 (patch) | |
| tree | 3bbc87bceec51a556dfccbedeb13c7d23418afcf /.gitignore | |
| parent | 0bc0e3e51a4229245c4111667eec9133a1a8984c (diff) | |
| parent | 39d33793479fd001dd06505575dd3294fe1d8ce4 (diff) | |
| download | otp-a02721920321d999a79dfd81494186b3ab3d3d81.tar.gz otp-a02721920321d999a79dfd81494186b3ab3d3d81.tar.bz2 otp-a02721920321d999a79dfd81494186b3ab3d3d81.zip | |
Merge branch 'dgud/tools/emacs-xref/PR-1051'
* dgud/tools/emacs-xref/PR-1051:
Add xref support in erlang.el
Conflicts:
lib/tools/emacs/erlang.el
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 455d3e5f55..3fc95170aa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # emacs *~ lib/tools/emacs/*.elc +TAGS # vim .*.sw[a-z] |