aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo@gcc.gnu.org>2007-09-02 13:06:31 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2007-09-02 13:06:31 +0000
commit3c83544d6217312fff8dd1808e626e3c6188d449 (patch)
tree9fe08ef1f315fad69662be70c539e7487e008f0f
parent8bcebc69b873883d1180382c9599ff563d9b9264 (diff)
downloadgcc-3c83544d6217312fff8dd1808e626e3c6188d449.zip
gcc-3c83544d6217312fff8dd1808e626e3c6188d449.tar.gz
gcc-3c83544d6217312fff8dd1808e626e3c6188d449.tar.bz2
2007-09-02 Paolo Carlini <pcarlini@suse.de>
* Remove junk in ChangeLog. From-SVN: r128026
-rw-r--r--gcc/cp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 43883e6..4cb5476 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -62,7 +62,6 @@
(get_delta_difference_1): New function.
(get_delta_difference): Refactor to call get_delta_difference_1.
->>>>>>> .r127998
2007-08-28 Paolo Carlini <pcarlini@suse.de>
PR c++/33209