1 files changed, 11 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index af468126952..f849a96a66e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-12  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: Add description for attachments, plus
+        minor changes.
+
+2008-07-24  Carsten Dominik  <dominik@science.uva.nl>
+
+        * refcards/orgcard.tex: Minor fixes.
+
 2008-09-08  Daiki Ueno  <ueno@unixuser.org>
 
         * TODO: Remove the entry describing auto-encryption.
@@ -36,11 +45,13 @@
         * PROBLEMS:
         * MACHINES: Remove VMS info.
 
+>>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * PROBLEMS:
         * MACHINES: Remove mentions of Mac Carbon.
 
+>>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.