Mercurial > emacs
comparison nt/ChangeLog @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | 4c86fe2e7016 376148b31b5e |
children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
112227:07e52ed69b5d | 112228:417b1e4d63cd |
---|---|
1919 ;; coding: utf-8 | 1919 ;; coding: utf-8 |
1920 ;; add-log-time-zone-rule: t | 1920 ;; add-log-time-zone-rule: t |
1921 ;; End: | 1921 ;; End: |
1922 | 1922 |
1923 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, | 1923 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, |
1924 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 1924 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
1925 | 1925 |
1926 This file is part of GNU Emacs. | 1926 This file is part of GNU Emacs. |
1927 | 1927 |
1928 GNU Emacs is free software: you can redistribute it and/or modify | 1928 GNU Emacs is free software: you can redistribute it and/or modify |
1929 it under the terms of the GNU General Public License as published by | 1929 it under the terms of the GNU General Public License as published by |