Merge from trunk.

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index 39e82ad74ad276ae56fcef19c8f0796af842ffe8..845411f5cde249ae197b6cb04d9e3dabb386e77a 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,5 +1,5 @@
 /* Header for composite sequence handler.
-   Copyright (C) 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 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