diff options
| author | Paul Eggert | 2011-02-15 17:35:20 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-15 17:35:20 -0800 |
| commit | 0ca2f89e09202a02f392c1defba2105b69c01419 (patch) | |
| tree | d76aed3e54b4e2c514a9057cd9176a606f6d0402 /admin | |
| parent | 976e1fab21d225a89c029d1250470af02ef999b3 (diff) | |
| parent | 1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518 (diff) | |
| download | emacs-0ca2f89e09202a02f392c1defba2105b69c01419.tar.gz emacs-0ca2f89e09202a02f392c1defba2105b69c01419.zip | |
Merge from mainline.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 335fe1df921..64d6de69d10 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2011-02-15 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-02-16 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): |