diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-05 15:30:09 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-05 15:30:09 -0500 |
commit | 4fda400e58339cdf962b5679bf05ebe62c6189c5 (patch) | |
tree | 8588108b9046f7ec6747112cd30509466ea49459 /.gitignore | |
parent | 0d7b2c96d388f5a9b539df3cb7f4ef115e7010b7 (diff) | |
parent | c1c2cee7c5ae1eff6edb198814423e55cb11cc73 (diff) | |
download | emacs-4fda400e58339cdf962b5679bf05ebe62c6189c5.tar.gz |
Merge from emacs-24
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index ff0e5ed0101..228deaaf8e5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,11 @@ # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +# Currently we assume only Git 1.7.1 (April 2010) or later, so this +# file does not rely on "**" in patterns. The "**" feature was added +# in Git 1.8.2 (March 2013). + + # Built by 'autogen.sh'. /aclocal.m4 /configure @@ -72,13 +77,10 @@ src/buildobj.h src/globals.h # Lisp-level sources built by 'make'. +*cus-load.el +*loaddefs.el leim/changed.misc leim/changed.tit -lisp/**/*cus-load.el -lisp/cus-load.el -lisp/**/*loaddefs.el -lisp/**/**/*loaddefs.el -lisp/*loaddefs.el lisp/cedet/semantic/bovine/c-by.el lisp/cedet/semantic/bovine/make-by.el lisp/cedet/semantic/bovine/scm-by.el |