Mercurial > emacs

diff doc/emacs/ChangeLog @ 107671:71b254d49a0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* misc.texi (Navigation): Document doc-view-continuous.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 25 Mar 2010 16:15:52 -0400
parents daf1d382bc07
children abfd9eb36f84
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Thu Mar 25 01:53:30 2010 -0400
+++ b/doc/emacs/ChangeLog	Thu Mar 25 16:15:52 2010 -0400
@@ -1,3 +1,7 @@
+2010-03-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* misc.texi (Navigation): Document doc-view-continuous.
+
 2010-03-24  Glenn Morris  <rgm@gnu.org>
 
 	* ack.texi (Acknowledgments):
@@ -30,7 +34,6 @@
 	* xresources.texi (Table of Resources):
 	* mule.texi (Defining Fontsets, Charsets): Update xrefs.
 
->>>>>>> MERGE-SOURCE
 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.texi (Init Examples): Add xref to Locals.