From: zappo <zappo@users.sourceforge.net>
Date: Sun, 1 Mar 2009 04:39:11 +0000 (+0000)
Subject: Merge from 1.0pre6 branch
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4ea343d46eaaffbb4079587f21fcb68cf4a2508;p=emacs.git

Merge from 1.0pre6 branch
---

diff --git a/test/manual/cedet/Makefile b/test/manual/cedet/Makefile
index edc92bb1a29..b5e2d5a421a 100644
--- a/test/manual/cedet/Makefile
+++ b/test/manual/cedet/Makefile
@@ -15,7 +15,7 @@ EMACSFLAGS=-batch --no-site-file
 LOADPATH= ../speedbar/ ../contrib/ ../ede/ ../srecode/ ../semantic/wisent/ ../semantic/bovine/ ../semantic/ ../eieio/ ../common/
 templates_MISC=cit-extra-cpp.srt
 scripts_MISC=cit-test.sh
-Misc_MISC=README
+Misc_MISC=README ChangeLog
 VERSION=1.0
 DISTDIR=$(top)cit-$(VERSION)