[Emacs-diffs] emacs/doc/misc ChangeLog

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/09/28 14:27:48

Modified files:
        doc/misc       : ChangeLog 

Log message:
        *** empty log message ***

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/ChangeLog?cvsroot=emacs&r1=1.321&r2=1.322

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/misc/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -b -r1.321 -r1.322
--- ChangeLog   28 Sep 2009 14:27:08 -0000      1.321
+++ ChangeLog   28 Sep 2009 14:27:48 -0000      1.322
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-09-28  Michael Albinus  <address@hidden>
 
        * tramp.texi (History): Add IMAP support.
@@ -9,12 +8,10 @@
 
        * trampver.texi: Set default value of `emacsimap'.
 
-=======
 2009-09-22  Daiki Ueno  <address@hidden>
 
        * gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
->>>>>>> 1.320
 2009-09-13  Chong Yidong  <address@hidden>
 
        * dired-x.texi (Technical Details): Delete