comparison lisp/ChangeLog.9 @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children 0eb2f9d5e474 e0f89e89ed02
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
20692 ;; Local Variables: 20692 ;; Local Variables:
20693 ;; coding: utf-8 20693 ;; coding: utf-8
20694 ;; End: 20694 ;; End:
20695 20695
20696 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 20696 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
20697 2007, 2008, 2009 Free Software Foundation, Inc. 20697 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
20698 20698
20699 This file is part of GNU Emacs. 20699 This file is part of GNU Emacs.
20700 20700
20701 GNU Emacs is free software: you can redistribute it and/or modify 20701 GNU Emacs is free software: you can redistribute it and/or modify
20702 it under the terms of the GNU General Public License as published by 20702 it under the terms of the GNU General Public License as published by