diff options
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
---|---|---|
committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
commit | 886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28 (patch) | |
tree | b5770d9fc10a704ad8aeb3474c6940121252c770 /src/composite.h | |
parent | 015a6e1df2772bd43680df5cbeaffccf98a881da (diff) | |
parent | 8dc00b2f1e6523c634df3e24379afbe712a32b27 (diff) | |
download | emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.gz emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.bz2 emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.zip |
Merge branch 'master' into harfbuzz
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 8ee18cd9eea..45d72fb345d 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,5 @@ /* Header for composite sequence handler. - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2019 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 |