diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/json.el | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
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 8432ba40c12..29beaedebe9 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -1,6 +1,6 @@ ;;; json.el --- JavaScript Object Notation parser / generator -;; Copyright (C) 2006-2012 Free Software Foundation, Inc. +;; Copyright (C) 2006-2013 Free Software Foundation, Inc. ;; Author: Edward O'Connor <ted@oconnor.cx> ;; Version: 1.4 |