summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-22 22:09:27 +0000
committerfxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>2005-03-22 22:09:27 +0000
commitc5217bf5380ac848a5673ff7271a865147d40dbf (patch)
treed8729ab7a834c2c59fd4a578ea96118a70afa689
parenta1b673caf38af231b55ce4d3c2e1c36ab2af5891 (diff)
downloadppe42-gcc-c5217bf5380ac848a5673ff7271a865147d40dbf.tar.gz
ppe42-gcc-c5217bf5380ac848a5673ff7271a865147d40dbf.zip
* gcc/testsuite/Changelog: previous commit scrambled Changelog.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96895 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b33170e1b3..95fa9495bfd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -73,7 +73,6 @@
* gcc.c-torture/compile/pr20539-1.c: Likewise.
* g++.dg/opt/pr13066-1.C: Likewise.
->>>>>>> 1.5197
2005-03-20 Joseph S. Myers <joseph@codesourcery.com>
* gcc.dg/bitfld-14.c, gcc.dg/enum3.c: New tests.
OpenPOWER on IntegriCloud