comparison lisp/ChangeLog.11 @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children e6408c088fbc 376148b31b5e
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
14334 14334
14335 ;; Local Variables: 14335 ;; Local Variables:
14336 ;; coding: utf-8 14336 ;; coding: utf-8
14337 ;; End: 14337 ;; End:
14338 14338
14339 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 14339 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
14340 Free Software Foundation, Inc. 14340 Free Software Foundation, Inc.
14341 14341
14342 This file is part of GNU Emacs. 14342 This file is part of GNU Emacs.
14343 14343
14344 GNU Emacs is free software: you can redistribute it and/or modify 14344 GNU Emacs is free software: you can redistribute it and/or modify