comparison src/ChangeLog.9 @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents d1c6f23c3e92 376148b31b5e
children
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
13292 13292
13293 ;; Local Variables: 13293 ;; Local Variables:
13294 ;; coding: utf-8 13294 ;; coding: utf-8
13295 ;; End: 13295 ;; End:
13296 13296
13297 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 13297 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
13298 Free Software Foundation, Inc. 13298 Free Software Foundation, Inc.
13299 13299
13300 This file is part of GNU Emacs. 13300 This file is part of GNU Emacs.
13301 13301
13302 GNU Emacs is free software: you can redistribute it and/or modify 13302 GNU Emacs is free software: you can redistribute it and/or modify