diff options
| author | Tom Tromey | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /lib-src/ChangeLog | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 4e3f3424c91..35190fd2a8f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-31 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * etags.c (consider_token): Always zero-terminate token buffer. | ||
| 4 | (Bug#12306) | ||
| 5 | |||
| 1 | 2012-08-19 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-08-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Rely on <config.h> + <unistd.h> to declare 'environ'. | 8 | Rely on <config.h> + <unistd.h> to declare 'environ'. |