Mercurial > emacs
comparison doc/man/ChangeLog @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | 40af77a50adc 376148b31b5e |
| children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 112227:07e52ed69b5d | 112228:417b1e4d63cd |
|---|---|
| 108 ;; coding: utf-8 | 108 ;; coding: utf-8 |
| 109 ;; fill-column: 79 | 109 ;; fill-column: 79 |
| 110 ;; add-log-time-zone-rule: t | 110 ;; add-log-time-zone-rule: t |
| 111 ;; End: | 111 ;; End: |
| 112 | 112 |
| 113 Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 113 Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 114 | 114 |
| 115 This file is part of GNU Emacs. | 115 This file is part of GNU Emacs. |
| 116 | 116 |
| 117 GNU Emacs is free software: you can redistribute it and/or modify | 117 GNU Emacs is free software: you can redistribute it and/or modify |
| 118 it under the terms of the GNU General Public License as published by | 118 it under the terms of the GNU General Public License as published by |