HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
ert-x.el
diff --git
a/lisp/emacs-lisp/ert-x.el
b/lisp/emacs-lisp/ert-x.el
index
60d7477
..
531e83c
100644
(file)
--- a/
lisp/emacs-lisp/ert-x.el
+++ b/
lisp/emacs-lisp/ert-x.el
@@
-1,6
+1,6
@@
;;; ert-x.el --- Staging area for experimental extensions to ERT -*- lexical-binding: t -*-
;;; ert-x.el --- Staging area for experimental extensions to ERT -*- lexical-binding: t -*-
-;; Copyright (C) 2008, 2010-201
2
Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-201
3
Free Software Foundation, Inc.
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
;; Christian Ohler <ohler@gnu.org>
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
;; Christian Ohler <ohler@gnu.org>