diff options
| author | Paul Eggert | 2011-05-30 09:12:16 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-30 09:12:16 -0700 |
| commit | de677ace77fa48962be80b668662a7009498e5d6 (patch) | |
| tree | b596bc66c98f21f39fcf11b676c974161ba94f4e /src/ChangeLog | |
| parent | 703f86387fd680855fce275bc87a524ac8d746bf (diff) | |
| parent | 3687c2efb7e7a5b6afbf87588a248431ccc8dd65 (diff) | |
| download | emacs-de677ace77fa48962be80b668662a7009498e5d6.tar.gz emacs-de677ace77fa48962be80b668662a7009498e5d6.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2968b2da85f..7b0c73adbc9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -12,6 +12,8 @@ | |||
| 12 | 12 | ||
| 13 | 2011-05-30 Paul Eggert <eggert@cs.ucla.edu> | 13 | 2011-05-30 Paul Eggert <eggert@cs.ucla.edu> |
| 14 | 14 | ||
| 15 | * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests. | ||
| 16 | |||
| 15 | * eval.c (Qdebug): Now static. | 17 | * eval.c (Qdebug): Now static. |
| 16 | * lisp.h (Qdebug): Remove decl. This reverts a part of the | 18 | * lisp.h (Qdebug): Remove decl. This reverts a part of the |
| 17 | 2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of | 19 | 2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of |