comparison lisp/image.el @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children 8d9bcdbc2a6e 376148b31b5e
comparison
equal deleted inserted replaced
107616:fa5ad3eee9f5 107617:c5f9e4613394
1 ;;; image.el --- image API 1 ;;; image.el --- image API
2 2
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
4 ;; 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5 5
6 ;; Maintainer: FSF 6 ;; Maintainer: FSF
7 ;; Keywords: multimedia 7 ;; Keywords: multimedia
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.