From: Dave Love <fx@gnu.org>
Date: Wed, 6 Dec 2000 19:57:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.93~137
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fbee3231d084a7f0a94918678584600a4e41624d;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index 8418392e970..8bb69e387c8 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1,6 +1,6 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
 
-;; Copyright (C) 1985,87,92,93,94,,95,96,97,98,99,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1985,87,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
 
 ;; Authors:    2000- Martin Stjernholm
 ;;	       1998-1999 Barry A. Warsaw and Martin Stjernholm
diff --git a/src/ChangeLog b/src/ChangeLog
index 18459e55a58..9783d88397a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-06  Dave Love  <fx@gnu.org>
+
+	* strftime.c: Change some #if foo to #ifdef foo.
+
 2000-12-06  Andrew Innes  <andrewi@gnu.org>
 
 	* w32term.h (CP_INVALID): Rename to CP_UNKNOWN.