#

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62736c1d880c8a7e85f3c1368b360fa40b111fe5..0e0219c3a1cd503b83511386dbaf758b1e53b34b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-30  Andre Spiegel  <spiegel@gnu.org>
+
+       * vc-hooks.el (vc-recompute-state): Moved here from vc.el.
+
+       * vc-cvs.el (vc-cvs-state): Handle the case where vc-state is
+       still nil.
+
 2004-11-29  Luc Teirlinck  <teirllm@auburn.edu>
 
        * emulation/tpu-edt.el (tpu-help-keypad-map, tpu-help-text)