X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2FChangeLog;h=50311768d8b1f880d496a606d4d2a83750810efe;hb=06517bd4d841ffa7c8ebb91aeb4dfe1ddc9eba60;hp=de2ab3b421a93bb81e06c6246d2564a107e4dad3;hpb=eaa13879e3a7f3912cac915d17bf85854fbdb196;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de2ab3b421a..50311768d8b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-05  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* c-parser.c (c_parser_objc_method_definition): Updated comment.
+
 2010-10-05  Jan Hubicka  <jh@suse.cz>
 
 	* doc/invoke.texi (-flto-partition, lto-partitions, lto-minpartition):
@@ -1768,7 +1772,6 @@
 	unconditionally if TODO_rebuild_alias is set, else only when optimizing
 	if TODO_update_address_taken is set.
 
->>>>>>> .r164755
 2010-09-23  Anatoly Sokolov  <aesok@post.ru>
 
 	* config/arm/arm.h (OUTPUT_ADDR_CONST_EXTRA): Remove.