summaryrefslogtreecommitdiff
path: root/lisp/org/org-w3m.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:07 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:07 -0800
commit1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
treefc34bd815956a80c35f1e9a0f836a5378bf4b1ed /lisp/org/org-w3m.el
parentc043d9731b499a241830d705e9055c9e42ccf28c (diff)
parentef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
downloademacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016
Diffstat (limited to 'lisp/org/org-w3m.el')
-rw-r--r--lisp/org/org-w3m.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index 24693de8927..894dbef9d64 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -1,6 +1,6 @@
;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp