Mercurial > emacs
comparison leim/ChangeLog @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | f07ac5fe9893 376148b31b5e |
| children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 112227:07e52ed69b5d | 112228:417b1e4d63cd |
|---|---|
| 2109 ;; coding: utf-8 | 2109 ;; coding: utf-8 |
| 2110 ;; add-log-time-zone-rule: t | 2110 ;; add-log-time-zone-rule: t |
| 2111 ;; End: | 2111 ;; End: |
| 2112 | 2112 |
| 2113 Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, | 2113 Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, |
| 2114 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 2114 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 2115 | 2115 |
| 2116 This file is part of GNU Emacs. | 2116 This file is part of GNU Emacs. |
| 2117 | 2117 |
| 2118 GNU Emacs is free software: you can redistribute it and/or modify | 2118 GNU Emacs is free software: you can redistribute it and/or modify |
| 2119 it under the terms of the GNU General Public License as published by | 2119 it under the terms of the GNU General Public License as published by |