[Emacs-diffs] Changes to emacs/etc/ChangeLog,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/10/12 06:18:14

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -b -r1.736 -r1.737
--- ChangeLog   24 Sep 2008 01:16:20 -0000      1.736
+++ ChangeLog   12 Oct 2008 06:18:14 -0000      1.737
@@ -1,3 +1,12 @@
+2008-10-12  Carsten Dominik  <address@hidden>
+
+       * refcards/orgcard.tex: Add description for attachments, plus
+       minor changes.
+
+2008-07-24  Carsten Dominik  <address@hidden>
+
+       * refcards/orgcard.tex: Minor fixes.
+
 2008-09-08  Daiki Ueno  <address@hidden>
 
        * TODO: Remove the entry describing auto-encryption.
@@ -36,11 +45,13 @@
        * PROBLEMS:
        * MACHINES: Remove VMS info.
 
+>>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <address@hidden>
 
        * PROBLEMS:
        * MACHINES: Remove mentions of Mac Carbon.
 
+>>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <address@hidden>
 
        * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.