Mercurial > emacs
comparison lisp/ChangeLog.6 @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 0eb2f9d5e474 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
8021 ;; Local Variables: | 8021 ;; Local Variables: |
8022 ;; coding: utf-8 | 8022 ;; coding: utf-8 |
8023 ;; End: | 8023 ;; End: |
8024 | 8024 |
8025 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, | 8025 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, |
8026 2007, 2008, 2009 Free Software Foundation, Inc. | 8026 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
8027 | 8027 |
8028 This file is part of GNU Emacs. | 8028 This file is part of GNU Emacs. |
8029 | 8029 |
8030 GNU Emacs is free software: you can redistribute it and/or modify | 8030 GNU Emacs is free software: you can redistribute it and/or modify |
8031 it under the terms of the GNU General Public License as published by | 8031 it under the terms of the GNU General Public License as published by |