diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/org/org-docview.el | |
parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip |
Merge from mainline.
Diffstat (limited to 'lisp/org/org-docview.el')
-rw-r--r-- | lisp/org/org-docview.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el index cb0f24139a2..ee37d5eefde 100644 --- a/lisp/org/org-docview.el +++ b/lisp/org/org-docview.el @@ -1,6 +1,6 @@ ;;; org-docview.el --- support for links to doc-view-mode buffers -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Jan Böcker <jan.boecker at jboecker dot de> ;; Keywords: outlines, hypermedia, calendar, wp @@ -88,6 +88,5 @@ and append it." (provide 'org-docview) -;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe ;;; org-docview.el ends here |