diff options
author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
---|---|---|
committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /leim | |
parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
download | emacs-xwidget_mvp.tar.gz |
merge masterxwidget_mvp
Diffstat (limited to 'leim')
-rw-r--r-- | leim/ChangeLog.1 | 2 | ||||
-rw-r--r-- | leim/Makefile.in | 2 | ||||
-rw-r--r-- | leim/README | 2 | ||||
-rw-r--r-- | leim/leim-ext.el | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/leim/ChangeLog.1 b/leim/ChangeLog.1 index a8dbca29526..55d5b2ca131 100644 --- a/leim/ChangeLog.1 +++ b/leim/ChangeLog.1 @@ -2578,7 +2578,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1997-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1997-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/leim/Makefile.in b/leim/Makefile.in index e30895fc398..f000a93292b 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -# Copyright (C) 1997-2015 Free Software Foundation, Inc. +# Copyright (C) 1997-2016 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) diff --git a/leim/README b/leim/README index d37be9716e5..31ca72d1944 100644 --- a/leim/README +++ b/leim/README @@ -1,4 +1,4 @@ -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/leim/leim-ext.el b/leim/leim-ext.el index d3cd3c67e30..d46e1c4b5d1 100644 --- a/leim/leim-ext.el +++ b/leim/leim-ext.el @@ -1,6 +1,6 @@ ;; leim-ext.el -- extra leim configuration -*- coding:utf-8; -*- -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 |