# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 976132632 0
# Node ID 19d808b1f586f7fbe3a9fbdb6bdaed5f2b3ef5c0
# Parent  1139c325f6259a96e17fb816bf072d8eb28229f9
*** empty log message ***

diff -r 1139c325f625 -r 19d808b1f586 lisp/progmodes/cc-align.el
--- a/lisp/progmodes/cc-align.el	Wed Dec 06 19:56:47 2000 +0000
+++ b/lisp/progmodes/cc-align.el	Wed Dec 06 19:57:12 2000 +0000
@@ -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 -r 1139c325f625 -r 19d808b1f586 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 06 19:56:47 2000 +0000
+++ b/src/ChangeLog	Wed Dec 06 19:57:12 2000 +0000
@@ -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.