diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-02-05 06:22:39 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-02-05 06:22:39 +0000 |
| commit | 2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7 (patch) | |
| tree | 8bfe2e67c93a6b54a6f2bb04dabb4ada05a5dae5 /etc | |
| parent | 209f39ac8aa330b6bc4703049aa1cea9f8763ca8 (diff) | |
| download | emacs-2c015ae7872cd9ec9ea041d8725bd6815ba7b5a7.tar.gz | |
Fix previous change.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 19 |
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 @@ -<<<<<<< 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. @@ -20,7 +6,10 @@ * PROBLEMS (CPP): Note problem with resource compiler of MSVC. ->>>>>>> 1.761 +2009-02-02 Carsten Dominik <dominik@science.uva.nl> + + * refcards/orgcard.tex: New version number. + 2009-01-28 Juanma Barranquero <lekktu@gmail.com> * PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys. |