diff options
| author | Eli Zaretskii | 2014-12-08 19:10:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-12-08 19:10:38 +0200 |
| commit | 2354db7f53c25cfdac1b9436bbc56a54f16253f0 (patch) | |
| tree | f26f002d2c4732fdf69fe6c88c22c9c5bb2860f0 /src | |
| parent | 5872f843ff45de150f4b35cbc9b11e9f63c96cf2 (diff) | |
| download | emacs-2354db7f53c25cfdac1b9436bbc56a54f16253f0.tar.gz emacs-2354db7f53c25cfdac1b9436bbc56a54f16253f0.zip | |
Fix merge glitches in 2 ChangeLog files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5caa073c2c9..9cb9270e55d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | at once, call ns_set_represented_filename instead. | 21 | at once, call ns_set_represented_filename instead. |
| 22 | 22 | ||
| 23 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> | 23 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> |
| 24 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> | ||
| 25 | 24 | ||
| 26 | * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. | 25 | * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. |
| 27 | (struct bidi_stack): Reduce size by using bit fields and by | 26 | (struct bidi_stack): Reduce size by using bit fields and by |