procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix previous change.

Browse source
This commit is contained in:
Glenn Morris 2009-02-05 06:22:39 +00:00
parent 209f39ac8a
commit 2c015ae787
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
etc/ChangeLog
View file

@ -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.