# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1223792294 0
# Node ID 31250b733501885d1f131982d59f56e7fee514b2
# Parent  8339497a5b87e7372928b9b95002f5a2540281fd
*** empty log message ***

diff -r 8339497a5b87 -r 31250b733501 etc/ChangeLog
--- a/etc/ChangeLog	Sun Oct 12 06:14:01 2008 +0000
+++ b/etc/ChangeLog	Sun Oct 12 06:18:14 2008 +0000
@@ -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.