diff options
| author | Joakim Verona | 2012-04-26 11:52:04 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-04-26 11:52:04 +0200 |
| commit | ab5b626f97ea7d71a98a06d8cc777fa925a1f716 (patch) | |
| tree | 7961d0e6b583290e1480771cd0fabd00f4ea7f86 /admin/ChangeLog | |
| parent | 2ec5843f029c7d55234dbe51d993003b2b3939ec (diff) | |
| parent | ab036cd7bdd7b087047d241ffb5607d14942179e (diff) | |
| download | emacs-ab5b626f97ea7d71a98a06d8cc777fa925a1f716.tar.gz emacs-ab5b626f97ea7d71a98a06d8cc777fa925a1f716.zip | |
upstream partial out of memory
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 1cc52bc5fb5..a3a756bde64 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> | 1 | 2012-04-10 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". | ||
| 4 | |||
| 3 | * unidata/Makefile.in: Add FSF copyright. | 5 | * unidata/Makefile.in: Add FSF copyright. |
| 4 | Make it use autoconf features, and work for out-of-tree builds. | 6 | Make it use autoconf features, and work for out-of-tree builds. |
| 5 | 7 | ||