diff options
| author | Paul Eggert | 2011-07-08 13:22:17 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-08 13:22:17 -0700 |
| commit | 67517972df013491db07d81f516c7e56ddc214c8 (patch) | |
| tree | cbe742bb4f4f075bcbb670ea22dab331053f487a /ChangeLog | |
| parent | 2a84b02da8b20138fad7fafdea92d7c8f0564ee0 (diff) | |
| parent | 1b85461891d3354aef97bec97fab891ddb24e06e (diff) | |
| download | emacs-67517972df013491db07d81f516c7e56ddc214c8.tar.gz emacs-67517972df013491db07d81f516c7e56ddc214c8.zip | |
Merge from trunk.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -14,6 +14,8 @@ | |||
| 14 | * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro. | 14 | * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro. |
| 15 | (LIBES): Use it. | 15 | (LIBES): Use it. |
| 16 | 16 | ||
| 17 | * lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib. | ||
| 18 | |||
| 17 | 2011-07-07 Andreas Schwab <schwab@linux-m68k.org> | 19 | 2011-07-07 Andreas Schwab <schwab@linux-m68k.org> |
| 18 | 20 | ||
| 19 | * configure.in (maintainer-mode): Reflect default in help string. | 21 | * configure.in (maintainer-mode): Reflect default in help string. |