diff options
| author | Yuuki Harano | 2021-01-03 16:33:29 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-01-03 16:33:29 +0900 |
| commit | 44f7f57c6833149799539c5e0abcadf4d7d61d43 (patch) | |
| tree | b9bbe6e261c80333dfacb62f7288cc9b37bbf588 /src/coding.c | |
| parent | 0af4e7587e1b5ac9066e17b875952cb5a16e63c0 (diff) | |
| parent | 825b4ec338e82869dc656c7041ab2483b6c22479 (diff) | |
| download | emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.gz emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 8c2443889d4..739dd6adcb5 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Coding system handler (conversion, detection, etc). | 1 | /* Coding system handler (conversion, detection, etc). |
| 2 | Copyright (C) 2001-2020 Free Software Foundation, Inc. | 2 | Copyright (C) 2001-2021 Free Software Foundation, Inc. |
| 3 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 4 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 4 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 5 | National Institute of Advanced Industrial Science and Technology (AIST) | 5 | National Institute of Advanced Industrial Science and Technology (AIST) |