diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /lisp/json.el | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-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/json.el')
| -rw-r--r-- | lisp/json.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/json.el b/lisp/json.el index 85827b5d9bf..bd1ee531656 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -1,6 +1,6 @@ ;;; json.el --- JavaScript Object Notation parser / generator -;; Copyright (C) 2006-2015 Free Software Foundation, Inc. +;; Copyright (C) 2006-2016 Free Software Foundation, Inc. ;; Author: Edward O'Connor <ted@oconnor.cx> ;; Version: 1.4 |