Mercurial > emacs
comparison lisp/iimage.el @ 107010:238592f6c24a
Merge from trunk
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Thu, 14 Jan 2010 22:19:01 +0800 |
parents | 1d1d5d9bd884 |
children | 925f002ec4ab 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107009:3e16e7dbb4a5 | 107010:238592f6c24a |
---|---|
1 ;;; iimage.el --- Inline image minor mode. | 1 ;;; iimage.el --- Inline image minor mode. |
2 | 2 |
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: KOSEKI Yoshinori <kose@meadowy.org> | 5 ;; Author: KOSEKI Yoshinori <kose@meadowy.org> |
6 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> | 6 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> |
7 ;; Keywords: multimedia | 7 ;; Keywords: multimedia |
8 | 8 |