Merge from 1.0pre6 branch

diff --git a/test/manual/cedet/Makefile b/test/manual/cedet/Makefile
index edc92bb1a293f8b49c694b09a30666d23c98e39c..b5e2d5a421a7616176f9640fa1f69d8911c9fa97 100644 (file)
--- 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)