diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
| commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
| tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /src/composite.h | |
| parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
| parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
| download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.bz2 emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip | |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index 80e17408831..dc1e7ce3457 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,5 @@ /* Header for composite sequence handler. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2017 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 |