summaryrefslogtreecommitdiffstats
path: root/gcc/cp/ChangeLog
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-02 13:06:31 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-02 13:06:31 +0000
commitd563bffdb5c1f6c8f2d9e8019960bf85d2c0c44a (patch)
tree9fe08ef1f315fad69662be70c539e7487e008f0f /gcc/cp/ChangeLog
parentd8fad1b4462fdf729f1677163b861ba1e68fb1c1 (diff)
downloadppe42-gcc-d563bffdb5c1f6c8f2d9e8019960bf85d2c0c44a.tar.gz
ppe42-gcc-d563bffdb5c1f6c8f2d9e8019960bf85d2c0c44a.zip
2007-09-02 Paolo Carlini <pcarlini@suse.de>
* Remove junk in ChangeLog. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128026 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/ChangeLog')
-rw-r--r--gcc/cp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 43883e65973..4cb5476a499 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
OpenPOWER on IntegriCloud