[Emacs-diffs] Changes to emacs/man/ChangeLog

[Carsten Dominik]

Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.574 emacs/man/ChangeLog:1.575
*** emacs/man/ChangeLog:1.574   Wed May 18 15:02:44 2005
--- emacs/man/ChangeLog Fri May 20 11:27:45 2005
***************
*** 1,3 ****
--- 1,13 ----
+ 2005-05-20  Carsten Dominik  <address@hidden>
+ 
+       * org.texi: Version 3.09
+ 
+ <<<<<<< ChangeLog
+ 2005-05-18  Carsten Dominik  <address@hidden>
+ 
+       * reftex.texi: Version 4.28
+ 
+ =======
  2005-05-18  Luc Teirlinck  <address@hidden>
  
        * buffers.texi (Select Buffer): Document `C-u M-g M-g'.
***************
*** 114,119 ****
--- 124,130 ----
  
        * building.texi (Debugger Operation): Clarify previous change.
  
+ >>>>>>> 1.574
  2005-04-29  Carsten Dominik  <address@hidden>
  
        * org.texi: Version 3.08, structure reorganized.