diff options
| author | Paul Eggert | 2012-04-15 17:35:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-04-15 17:35:58 -0700 |
| commit | 8dcd9adf660cbe463a3e56707f5c15d8f34b2f87 (patch) | |
| tree | 2ed9cc3fcb75cf128dbd92721f505dc835024659 /src/ChangeLog | |
| parent | 20a14f94f6581d5c483a7df775cd129bdc9e20d5 (diff) | |
| parent | 9426aba403a8212c9273958bebf35f2e927f99ed (diff) | |
| download | emacs-8dcd9adf660cbe463a3e56707f5c15d8f34b2f87.tar.gz emacs-8dcd9adf660cbe463a3e56707f5c15d8f34b2f87.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dfe694c71a3..3a2984ff398 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-16 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * alloc.c (which_symbols): Fix alignment issue / type clash. | ||
| 4 | |||
| 1 | 2012-04-15 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2012-04-15 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * lisp.h (struct Lisp_Symbol): Remove explicit padding. | 7 | * lisp.h (struct Lisp_Symbol): Remove explicit padding. |