diff options
| author | Paul Eggert | 2011-02-17 23:44:39 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-17 23:44:39 -0800 |
| commit | 37b3d30244ad822e049b6b20c2eadf5946cb02cc (patch) | |
| tree | 49bfe5e475aee761975f2618be4ee1b7c8371a72 /ChangeLog | |
| parent | 0ca2f89e09202a02f392c1defba2105b69c01419 (diff) | |
| parent | 7d315eb67800796d7d7f39030eb7682340d985e5 (diff) | |
| download | emacs-37b3d30244ad822e049b6b20c2eadf5946cb02cc.tar.gz emacs-37b3d30244ad822e049b6b20c2eadf5946cb02cc.zip | |
Merge from mainline.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-18 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Import IRIX 6.5 getloadavg fixes from gnulib. | ||
| 4 | * configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate. | ||
| 5 | |||
| 1 | 2011-02-16 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-02-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Import getloadavg module from gnulib. | 8 | Import getloadavg module from gnulib. |