[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/etc ChangeLog
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/etc ChangeLog |
Date: |
Thu, 05 Feb 2009 06:22:40 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/02/05 06:22:40
Modified files:
etc : ChangeLog
Log message:
Fix previous change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ChangeLog?cvsroot=emacs&r1=1.762&r2=1.763
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -b -r1.762 -r1.763
--- ChangeLog 4 Feb 2009 23:01:58 -0000 1.762
+++ ChangeLog 5 Feb 2009 06:22:39 -0000 1.763
@@ -1,17 +1,3 @@
-<<<<<<< ChangeLog
-2009-02-02 Carsten Dominik <address@hidden>
-
- * refcards/orgcard.tex: New version number.
-
-2009-01-31 Carsten Dominik <address@hidden>
-
- * refcards/orgcard.tex: New version number.
-
-2009-01-30 Carsten Dominik <address@hidden>
-
- * refcards/orgcard.tex: New version number.
-
-=======
2009-02-04 Dan Nicolaescu <address@hidden>
* 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 <address@hidden>
+
+ * refcards/orgcard.tex: New version number.
+
2009-01-28 Juanma Barranquero <address@hidden>
* PROBLEMS (Windows): Add entry about TCC/4NT and App Paths keys.