diff options
| author | Paul Eggert | 2016-01-01 01:12:52 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-18 22:29:10 -0800 |
| commit | cd19641ed3236c8d51b882f867c58e719782dbfc (patch) | |
| tree | 51f1fd5f8951402894b9dfd5ae062ca12032c720 /lib/getloadavg.c | |
| parent | 394c81c092829cf82c41b859b3a246952854056b (diff) | |
| download | emacs-cd19641ed3236c8d51b882f867c58e719782dbfc.tar.gz emacs-cd19641ed3236c8d51b882f867c58e719782dbfc.zip | |
Merge from gnulib
This mostly just updates copyright dates of gnulib files.
It also updates to the latest version of texinfo.tex.
Diffstat (limited to 'lib/getloadavg.c')
| -rw-r--r-- | lib/getloadavg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 0cbca265b29..a7ffd06c451 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Get the system load averages. | 1 | /* Get the system load averages. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2015 Free Software | 3 | Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2016 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | NOTE: The canonical source of this file is maintained with gnulib. | 6 | NOTE: The canonical source of this file is maintained with gnulib. |