diff options
| author | Po Lu | 2023-01-02 21:38:37 +0800 |
|---|---|---|
| committer | Po Lu | 2023-01-02 21:38:37 +0800 |
| commit | 6d823d1077e979b3266e85cbdc476646b7bdb36b (patch) | |
| tree | 99c1ce32391f258084caa4bfc44686d12dff7c34 /src/coding.c | |
| parent | a32963e11f9f8e5d22b0d754d34a867f3b178ed2 (diff) | |
| parent | c209802f7b3721a1b95113290934a23fee88f678 (diff) | |
| download | emacs-6d823d1077e979b3266e85cbdc476646b7bdb36b.tar.gz emacs-6d823d1077e979b3266e85cbdc476646b7bdb36b.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
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 ab73bda8440..4e59f2b6a1b 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-2022 Free Software Foundation, Inc. | 2 | Copyright (C) 2001-2023 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) |