aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-12-05 13:19:14 +0200
committerEli Zaretskii2014-12-05 13:19:14 +0200
commit933107f290d47c202aadd1465d4774a4d5fcb10d (patch)
tree6964be44ec621f5eeaa1b96fed348d790a30f932
parentfcc4da3e5227f64b57e5e7ac497df28229b88f7d (diff)
downloademacs-933107f290d47c202aadd1465d4774a4d5fcb10d.tar.gz
emacs-933107f290d47c202aadd1465d4774a4d5fcb10d.zip
.gitignore: Ignore test/biditest.txt.
-rw-r--r--.gitignore1
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 71ded399f91..ff0e5ed0101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,6 +143,7 @@ src/*.map
143 143
144# Tests. 144# Tests.
145test/indent/*.new 145test/indent/*.new
146test/biditest.txt
146 147
147# ctags, etags. 148# ctags, etags.
148TAGS 149TAGS
diff --git a/ChangeLog b/ChangeLog
index cd7698c0ab5..56e7520d421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-12-05 Eli Zaretskii <eliz@gnu.org>
2
3 * .gitignore: Ignore test/biditest.txt.
4
12014-12-01 Lars Magne Ingebrigtsen <larsi@gnus.org> 52014-12-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * .gitignore: Ignore loaddefs directly under lisp, and in 7 * .gitignore: Ignore loaddefs directly under lisp, and in