Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.631 emacs/man/ChangeLog:1.632
*** emacs/man/ChangeLog:1.631 Tue Jul 19 11:20:23 2005
--- emacs/man/ChangeLog Tue Jul 19 16:58:19 2005
***************
*** 1,3 ****
--- 1,13 ----
+ 2005-07-19 Carsten Dominik <[EMAIL PROTECTED]>
+
+ * org.texi: Version 3.14
+
+ <<<<<<< ChangeLog
+ 2005-07-04 Carsten Dominik <[EMAIL PROTECTED]>
+
+ * org.texi: Version 3.13
+
+ =======
2005-07-19 Juri Linkov <[EMAIL PROTECTED]>
* files.texi (Comparing Files): Mention resync for `compare-windows'.
***************
*** 89,94 ****
--- 99,105 ----
* mh-e.texi (Copying):
* trouble.texi (Checklist): Update FSF's address.
+ >>>>>>> 1.631
2005-07-03 Richard M. Stallman <[EMAIL PROTECTED]>
* flymake.texi (Example -- Configuring a tool called directly):
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
