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 /admin/ChangeLog | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ea977e80cfa..145028ec815 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2012-08-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree. | ||
| 4 | |||
| 5 | 2012-08-28 Andreas Schwab <schwab@linux-m68k.org> | ||
| 6 | |||
| 7 | * charsets/mule-charsets.el (header): Fix typo. | ||
| 8 | |||
| 9 | 2012-08-24 Paul Eggert <eggert@cs.ucla.edu> | ||
| 10 | |||
| 11 | On assertion failure, print backtrace if available. | ||
| 12 | * merge-gnulib (GNULIB_MODULES): Add execinfo. | ||
| 13 | |||
| 1 | 2012-08-16 Paul Eggert <eggert@cs.ucla.edu> | 14 | 2012-08-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 15 | ||
| 3 | Use ASCII tests for character types. | 16 | Use ASCII tests for character types. |