diff options
| author | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-30 21:07:42 +0900 |
| commit | 31e7d6e0902a895e13833204907dfb86268b5acf (patch) | |
| tree | 445b59dd5e87c8e2a8b969356386f45cae8cd6d9 /admin/ChangeLog | |
| parent | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (diff) | |
| parent | f17e1d00e0513d781d2bd9a80af24bb047d32d5c (diff) | |
| download | emacs-31e7d6e0902a895e13833204907dfb86268b5acf.tar.gz emacs-31e7d6e0902a895e13833204907dfb86268b5acf.zip | |
merge trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 0c674b91ea4..145028ec815 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 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 | |||
| 1 | 2012-08-24 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2012-08-24 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 10 | ||
| 3 | On assertion failure, print backtrace if available. | 11 | On assertion failure, print backtrace if available. |