diff options
| author | John Wiegley | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /src/blockinput.h | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
Diffstat (limited to 'src/blockinput.h')
| -rw-r--r-- | src/blockinput.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blockinput.h b/src/blockinput.h index b0dbdf22885..5b8bf64049a 100644 --- a/src/blockinput.h +++ b/src/blockinput.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* blockinput.h - interface to blocking complicated interrupt-driven input. | 1 | /* blockinput.h - interface to blocking complicated interrupt-driven input. |
| 2 | Copyright (C) 1989, 1993, 2001-2015 Free Software Foundation, Inc. | 2 | Copyright (C) 1989, 1993, 2001-2016 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||