Mercurial > emacs
comparison lwlib/ChangeLog @ 106931:fc97b35886c9
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 13 Jan 2010 09:37:38 +0000 |
parents | 1d1d5d9bd884 |
children | b4d27afff1bf bfc8980754ed |
comparison
equal
deleted
inserted
replaced
106930:a30f962075db | 106931:fc97b35886c9 |
---|---|
1386 ;; coding: utf-8 | 1386 ;; coding: utf-8 |
1387 ;; add-log-time-zone-rule: t | 1387 ;; add-log-time-zone-rule: t |
1388 ;; End: | 1388 ;; End: |
1389 | 1389 |
1390 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, | 1390 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, |
1391 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 1391 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
1392 | 1392 |
1393 This file is part of GNU Emacs. | 1393 This file is part of GNU Emacs. |
1394 | 1394 |
1395 GNU Emacs is free software: you can redistribute it and/or modify | 1395 GNU Emacs is free software: you can redistribute it and/or modify |
1396 it under the terms of the GNU General Public License as published by | 1396 it under the terms of the GNU General Public License as published by |