diff info/dir @ 112411:6178cf733e6f

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 21 Jan 2011 21:52:29 -0800
parents 0222e3f822e3
children
line wrap: on
line diff
--- a/info/dir	Fri Jan 21 16:12:10 2011 -0800
+++ b/info/dir	Fri Jan 21 21:52:29 2011 -0800
@@ -67,6 +67,7 @@
                                   merging programs.
 * EDT: (edt).                   An Emacs emulation of the EDT editor.
 * EIEIO: (eieio).               An object system for Emacs Lisp.
+* ERT: (ert).                   Emacs Lisp regression testing tool.
 * Eshell: (eshell).             A command shell implemented in Emacs Lisp.
 * Flymake: (flymake).           A universal on-the-fly syntax checker.
 * Forms: (forms).               Emacs package for editing data bases