Mercurial > emacs
comparison leim/ChangeLog @ 107010:238592f6c24a
Merge from trunk
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Thu, 14 Jan 2010 22:19:01 +0800 |
parents | 1d1d5d9bd884 |
children | 1183cf6a4bb8 |
comparison
equal
deleted
inserted
replaced
107009:3e16e7dbb4a5 | 107010:238592f6c24a |
---|---|
2039 ;; coding: utf-8 | 2039 ;; coding: utf-8 |
2040 ;; add-log-time-zone-rule: t | 2040 ;; add-log-time-zone-rule: t |
2041 ;; End: | 2041 ;; End: |
2042 | 2042 |
2043 Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, | 2043 Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, |
2044 2007, 2008, 2009 Free Software Foundation, Inc. | 2044 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
2045 | 2045 |
2046 This file is part of GNU Emacs. | 2046 This file is part of GNU Emacs. |
2047 | 2047 |
2048 GNU Emacs is free software: you can redistribute it and/or modify | 2048 GNU Emacs is free software: you can redistribute it and/or modify |
2049 it under the terms of the GNU General Public License as published by | 2049 it under the terms of the GNU General Public License as published by |