Mercurial > emacs
comparison lisp/image.el @ 110018:aa172fa85851
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 30 Aug 2010 09:15:54 +0900 |
parents | 280c8ae2476d |
children | 60d36a04fc87 |
comparison
equal
deleted
inserted
replaced
109990:7ab569e9f738 | 110018:aa172fa85851 |
---|---|
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, | 3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Maintainer: FSF | 6 ;; Maintainer: FSF |
7 ;; Keywords: multimedia | 7 ;; Keywords: multimedia |
8 ;; Package: emacs | |
8 | 9 |
9 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
10 | 11 |
11 ;; GNU Emacs is free software: you can redistribute it and/or modify | 12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |