procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge glitches in 2 ChangeLog files.

Browse source
This commit is contained in:
Eli Zaretskii 2014-12-08 19:10:38 +02:00
parent 5872f843ff
commit 2354db7f53
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -19,7 +19,6 @@
* .gitignore: Remove redundant pattern (subsumed by _*).
Avoid "**", as it requires Git 1.8.2 or later.
2014-12-05 Paul Eggert <eggert@cs.ucla.edu>
2014-12-05 Eli Zaretskii <eliz@gnu.org>
* .gitignore: Ignore test/biditest.txt.

1
src/ChangeLog
View file

@ -20,7 +20,6 @@
* nsfns.m (ns_set_name_as_filename): Don't set represented filename
at once, call ns_set_represented_filename instead.
2014-12-05 Eli Zaretskii <eliz@gnu.org>
2014-12-05 Eli Zaretskii <eliz@gnu.org>
* dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.