summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/assoc.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-14 10:14:17 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-14 10:14:17 -0800
commit8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch)
tree9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /lisp/emacs-lisp/assoc.el
parent3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff)
parentf80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff)
downloademacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz
emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.bz2
emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp/assoc.el')
-rw-r--r--lisp/emacs-lisp/assoc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index ccab5d90c09..e90c9df7f82 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -1,7 +1,7 @@
;;; assoc.el --- insert/delete/sort functions on association lists
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2010 Free Software Foundation, Inc.
+;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Keywords: extensions