Mercurial > emacs
comparison src/coding.h @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | a80c1e8d9df4 376148b31b5e |
| children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 112227:07e52ed69b5d | 112228:417b1e4d63cd |
|---|---|
| 1 /* Header for coding system handler. | 1 /* Header for coding system handler. |
| 2 Copyright (C) 2001, 2002, 2003, 2004, 2005, | 2 Copyright (C) 2001, 2002, 2003, 2004, 2005, |
| 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 5 2005, 2006, 2007, 2008, 2009, 2010 | 5 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 National Institute of Advanced Industrial Science and Technology (AIST) | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
| 7 Registration Number H14PRO021 | 7 Registration Number H14PRO021 |
| 8 Copyright (C) 2003 | 8 Copyright (C) 2003 |
| 9 National Institute of Advanced Industrial Science and Technology (AIST) | 9 National Institute of Advanced Industrial Science and Technology (AIST) |
| 10 Registration Number H13PRO009 | 10 Registration Number H13PRO009 |
