summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorCarsten Dominik <dominik@science.uva.nl>2009-02-04 23:01:58 +0000
committerCarsten Dominik <dominik@science.uva.nl>2009-02-04 23:01:58 +0000
commitcc6dbcb7b7d825535366c3ce4fb6720ad96ebbb0 (patch)
tree24c9ca9bf1f640213d1741a6ba05c36bc8d2cc61 /etc
parent08c0386de34a699d313fff3e899610611e7912d3 (diff)
downloademacs-cc6dbcb7b7d825535366c3ce4fb6720ad96ebbb0.tar.gz
2009-02-04 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-return-follows-link): Revert setting `org-return-follows-link' to t by default.
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 45ecf6cbac2..4f9935c9150 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,17 @@
+<<<<<<< ChangeLog
+2009-02-02 Carsten Dominik <dominik@science.uva.nl>
+
+ * refcards/orgcard.tex: New version number.
+
+2009-01-31 Carsten Dominik <dominik@science.uva.nl>
+
+ * refcards/orgcard.tex: New version number.
+
+2009-01-30 Carsten Dominik <dominik@science.uva.nl>
+
+ * refcards/orgcard.tex: New version number.
+
+=======
2009-02-04 Dan Nicolaescu <dann@ics.uci.edu>
* compilation.txt (gnu): Add an example for the "note" format.
@@ -6,6 +20,7 @@
* PROBLEMS (CPP): Note problem with resource compiler of MSVC.
+>>>>>>> 1.761
2009-01-28 Juanma Barranquero <lekktu@gmail.com>
* PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.