diff options
author | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /lisp/emacs-lisp/cl-seq.el | |
parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.bz2 emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
Diffstat (limited to 'lisp/emacs-lisp/cl-seq.el')
-rw-r--r-- | lisp/emacs-lisp/cl-seq.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index fbf68f62b4a..6b5b329e33f 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1993, 2001-2013 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> -;; Version: 2.02 +;; Old-Version: 2.02 ;; Keywords: extensions ;; Package: emacs |