Mercurial > emacs

changeset 98646:31250b733501

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Carsten Dominik <dominik@science.uva.nl>
date Sun, 12 Oct 2008 06:18:14 +0000
parents 8339497a5b87
children 612ddd12d370
files etc/ChangeLog
diffstat 1 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.