aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Andrus2014-11-14 23:41:09 -0700
committerIvan Andrus2014-11-18 00:21:37 -0700
commitfe1b545d773b18a053bd7878d36296e28b52cfe6 (patch)
tree7fee572d45ebc8931af8ada3bd2aef78bc83e649
parent342bc0e04b68d9c52503816bedaf67c9e77be8d2 (diff)
downloademacs-fe1b545d773b18a053bd7878d36296e28b52cfe6.tar.gz
emacs-fe1b545d773b18a053bd7878d36296e28b52cfe6.zip
* .gitignore: Add some nextstep/mac ignorables.
-rw-r--r--.gitignore5
-rw-r--r--ChangeLog4
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bd48c284ed2..ededdee562e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ makefile
17/config.status 17/config.status
18src/config.h 18src/config.h
19src/epaths.h 19src/epaths.h
20Info.plist
21InfoPlist.strings
20 22
21# C-level sources built by 'make'. 23# C-level sources built by 'make'.
22lib/alloca.h 24lib/alloca.h
@@ -32,6 +34,7 @@ lib/inttypes.h
32lib/libgnu.a 34lib/libgnu.a
33lib/signal.h 35lib/signal.h
34lib/stdalign.h 36lib/stdalign.h
37lib/stdint.h
35lib/stdio.h 38lib/stdio.h
36lib/stdlib.h 39lib/stdlib.h
37lib/string.h 40lib/string.h
@@ -101,6 +104,7 @@ src/stamp-h1
101oo/ 104oo/
102oo-spd/ 105oo-spd/
103src/*.map 106src/*.map
107*.dSYM/
104 108
105# Executables. 109# Executables.
106lib-src/blessmail 110lib-src/blessmail
@@ -118,6 +122,7 @@ src/bootstrap-emacs
118src/emacs 122src/emacs
119src/emacs-[0-9]* 123src/emacs-[0-9]*
120src/temacs 124src/temacs
125nextstep/Emacs.app/
121 126
122# Character-set info. 127# Character-set info.
123admin/charsets/*.el 128admin/charsets/*.el
diff --git a/ChangeLog b/ChangeLog
index 8cc6635f886..cb02ee681de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-11-18 Ivan Andrus <darthandrus@gmail.com>
2
3 * .gitignore: Add some nextstep/mac ignorables.
4
12014-11-18 Paul Eggert <eggert@cs.ucla.edu> 52014-11-18 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 .gitignore cleanup. 7 .gitignore cleanup.