diff options
| author | Joakim Verona | 2015-01-23 00:13:27 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-23 00:13:27 +0100 |
| commit | bdd672b275034e8c1c65992f2e21dac7cc6eba60 (patch) | |
| tree | 0e773e29ee7e4cbfb680ec31f7350643dd93366d /src/ChangeLog | |
| parent | 5693f3de69f9db99252b2f4eb1c7178fdec2a210 (diff) | |
| parent | 2f908e0cac317b381393e3efb70ec08dfaab5383 (diff) | |
| download | emacs-bdd672b275034e8c1c65992f2e21dac7cc6eba60.tar.gz emacs-bdd672b275034e8c1c65992f2e21dac7cc6eba60.zip | |
Merge branch 'master' into xwidget
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a98c77f3902..a8b9c3bf1c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-01-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (init_iterator): Restore a comment lost in transition. | ||
| 4 | |||
| 1 | 2015-01-22 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2015-01-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Use bool for boolean in xfont.c, xftfont.c, xgselect.c | 7 | Use bool for boolean in xfont.c, xftfont.c, xgselect.c |