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

[Reiner Steib]

Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.575 emacs/man/ChangeLog:1.576
*** emacs/man/ChangeLog:1.575   Fri May 20 11:27:45 2005
--- emacs/man/ChangeLog Fri May 20 17:47:03 2005
***************
*** 2,13 ****
  
        * 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'.
--- 2,11 ----
***************
*** 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.
--- 122,127 ----