diff options
| author | Paul Eggert | 2011-02-14 21:41:07 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-14 21:41:07 -0800 |
| commit | fae95934b8edae3f538063e756ac799ed94313b2 (patch) | |
| tree | 3bb814c43cd50db54591bf685e5cb72b863b5833 /admin/ChangeLog | |
| parent | 6d302144c218f12bd380344ae2d3ed87a6ea9327 (diff) | |
| parent | bb55f713d2e4ea089a861a257d7d000432642ce9 (diff) | |
| download | emacs-fae95934b8edae3f538063e756ac799ed94313b2.tar.gz emacs-fae95934b8edae3f538063e756ac799ed94313b2.zip | |
Merge from mainline.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ce7ff76aa2c..335fe1df921 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,9 +1,13 @@ | |||
| 1 | 2011-02-10 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-02-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Remove no-longer needed getloadavg symbols. | 3 | Remove no-longer needed getloadavg symbols. |
| 4 | * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): | 4 | * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): |
| 5 | (LDAV_SYMBOL): Remove. | 5 | (LDAV_SYMBOL): Remove. |
| 6 | 6 | ||
| 7 | 2011-02-12 Glenn Morris <rgm@gnu.org> | ||
| 8 | |||
| 9 | * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. | ||
| 10 | |||
| 7 | 2011-02-05 Glenn Morris <rgm@gnu.org> | 11 | 2011-02-05 Glenn Morris <rgm@gnu.org> |
| 8 | 12 | ||
| 9 | * bzrmerge.el (bzrmerge-warning-buffer): New constant. | 13 | * bzrmerge.el (bzrmerge-warning-buffer): New constant. |