Mercurial > emacs

comparison lisp/json.el @ 112228:417b1e4d63cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 376148b31b5e
children ef719132ddfa
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; json.el --- JavaScript Object Notation parser / generator 1 ;;; json.el --- JavaScript Object Notation parser / generator
2 2
3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4 4
5 ;; Author: Edward O'Connor <ted@oconnor.cx> 5 ;; Author: Edward O'Connor <ted@oconnor.cx>
6 ;; Version: 1.2 6 ;; Version: 1.2
7 ;; Keywords: convenience 7 ;; Keywords: convenience
8 8