Mercurial > emacs
comparison lisp/ChangeLog.14 @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | facc4bc3e1e4 376148b31b5e |
children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
112227:07e52ed69b5d | 112228:417b1e4d63cd |
---|---|
20549 | 20549 |
20550 ;; Local Variables: | 20550 ;; Local Variables: |
20551 ;; coding: utf-8 | 20551 ;; coding: utf-8 |
20552 ;; End: | 20552 ;; End: |
20553 | 20553 |
20554 Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. | 20554 Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
20555 | 20555 |
20556 This file is part of GNU Emacs. | 20556 This file is part of GNU Emacs. |
20557 | 20557 |
20558 GNU Emacs is free software: you can redistribute it and/or modify | 20558 GNU Emacs is free software: you can redistribute it and/or modify |
20559 it under the terms of the GNU General Public License as published by | 20559 it under the terms of the GNU General Public License as published by |