aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-02-05 06:22:39 +0000
committerGlenn Morris2009-02-05 06:22:39 +0000
commit2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7 (patch)
tree8bfe2e67c93a6b54a6f2bb04dabb4ada05a5dae5
parent209f39ac8aa330b6bc4703049aa1cea9f8763ca8 (diff)
downloademacs-2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7.tar.gz
emacs-2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7.zip
Fix previous change.
-rw-r--r--etc/ChangeLog19
1 files changed, 4 insertions, 15 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4f9935c9150..89526065a08 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,17 +1,3 @@
1<<<<<<< ChangeLog
22009-02-02 Carsten Dominik <dominik@science.uva.nl>
3
4 * refcards/orgcard.tex: New version number.
5
62009-01-31 Carsten Dominik <dominik@science.uva.nl>
7
8 * refcards/orgcard.tex: New version number.
9
102009-01-30 Carsten Dominik <dominik@science.uva.nl>
11
12 * refcards/orgcard.tex: New version number.
13
14=======
152009-02-04 Dan Nicolaescu <dann@ics.uci.edu> 12009-02-04 Dan Nicolaescu <dann@ics.uci.edu>
16 2
17 * compilation.txt (gnu): Add an example for the "note" format. 3 * compilation.txt (gnu): Add an example for the "note" format.
@@ -20,7 +6,10 @@
20 6
21 * PROBLEMS (CPP): Note problem with resource compiler of MSVC. 7 * PROBLEMS (CPP): Note problem with resource compiler of MSVC.
22 8
23>>>>>>> 1.761 92009-02-02 Carsten Dominik <dominik@science.uva.nl>
10
11 * refcards/orgcard.tex: New version number.
12
242009-01-28 Juanma Barranquero <lekktu@gmail.com> 132009-01-28 Juanma Barranquero <lekktu@gmail.com>
25 14
26 * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys. 15 * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.