diff options
| author | Joakim Verona | 2013-09-10 23:26:38 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-10 23:26:38 +0200 |
| commit | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (patch) | |
| tree | 58fde2f218fa45ee1b2c67184b50137a8fb6e140 /ChangeLog | |
| parent | ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (diff) | |
| parent | 43aac990c339c0fc3304aa476ebc8ea8467f107e (diff) | |
| download | emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.tar.gz emacs-92aeabcc8a007f521a664e3aee092eb80ad0f49a.zip | |
merge from trunk
Conflicts:
src/dispnew.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-27 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Simplify EMACS_TIME-related code. | ||
| 4 | Merge from gnulib, incorporating: | ||
| 5 | 2013-08-27 timespec: new convenience constants and function | ||
| 6 | |||
| 1 | 2013-08-27 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2013-08-27 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | * configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32) | 9 | * configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32) |