From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 25 Sep 2010 18:55:16 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~23
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=565c0ca57e89ab1a1b4c378c615a998eb8fc0f99;p=emacs.git

Merge changes from emacs-23 branch.
---

565c0ca57e89ab1a1b4c378c615a998eb8fc0f99
diff --cc lisp/cedet/ChangeLog
index df02d554004,5b75dfb5048..d99c3fd0d95
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
+ 2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* ede/linux.el (ede-project-class-files):
+ 	* ede/generic.el (ede-generic-new-autoloader):
+ 	* ede/emacs.el (ede-project-class-files):
+ 	* ede/simple.el (ede-project-class-files):
+ 	* ede/cpp-root.el (ede-project-class-files): Fix require name.
+ 
 +2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
 +
 +	* semantic/lex.el (semantic-ignore-comments): Doc fix.
 +
 +	* semantic/symref/list.el (semantic-symref-list-rename-open-hits):
 +	Fix typo in error message.
 +	(semantic-symref-list-map-open-hits): Fix typo in docstring.
 +
  2010-09-21  Eric Ludlam  <zappo@gnu.org>
  
  	Synch SRecode to CEDET 1.0.