Merge from trunk.

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 0a9bdcffc99051ad774539761735918eb71ea77b..0d1ab2663090154578ad3ed523a179ca9e27ac33 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,5 +1,5 @@
 /* Composite sequence support.
-   Copyright (C) 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    Copyright (C) 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