diff options
| author | K. Handa | 2014-12-29 22:54:07 +0900 |
|---|---|---|
| committer | K. Handa | 2014-12-29 22:54:07 +0900 |
| commit | bb5e7861593815f912c21b2aee1e4be9a6cc64a2 (patch) | |
| tree | 080066ad78a5de3f2a8a3fbfbc3e3d242c1c16b7 /src/ChangeLog | |
| parent | 3fa5f4416ed219688b9d0e370edf40dce15a5de3 (diff) | |
| parent | 8e0b2702ce8ad593a2098ae8028728ed137fb26c (diff) | |
| download | emacs-bb5e7861593815f912c21b2aee1e4be9a6cc64a2.tar.gz emacs-bb5e7861593815f912c21b2aee1e4be9a6cc64a2.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9e3fb904b93..2ab5101fc6f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-12-28 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix produce_composite_width typo | ||
| 4 | * term.c (produce_composite_glyph): | ||
| 5 | Fix typo that confused number of columns for pixel width. | ||
| 6 | |||
| 1 | 2014-12-28 Paul Eggert <eggert@Penguin.CS.UCLA.EDU> | 7 | 2014-12-28 Paul Eggert <eggert@Penguin.CS.UCLA.EDU> |
| 2 | 8 | ||
| 3 | Wrap dll functions more simply | 9 | Wrap dll functions more simply |