diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-10-31 04:53:00 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-10-31 04:53:00 +0000 |
| commit | 32584f728620e9fa6e514581f693b62f1ac7efd4 (patch) | |
| tree | 37c23509f4e2a31a5fdb2c8b0c1e0f9e8c36d6a8 /gcc | |
| parent | dc4a37ec55be1943ca2580d3a02383676addf41e (diff) | |
| download | gcc-32584f728620e9fa6e514581f693b62f1ac7efd4.zip gcc-32584f728620e9fa6e514581f693b62f1ac7efd4.tar.gz gcc-32584f728620e9fa6e514581f693b62f1ac7efd4.tar.bz2 | |
Fix garbage.
From-SVN: r141490
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e8f0911..e97b60f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,10 +1,8 @@ -<<<<<<< .mine 2008-10-30 Steven G. Kargl <kargls@comcast.net> PR fortran/37930 * gfortran.dg/int_conv_2.f90: New test. -======= 2008-10-30 Mikael Morin <mikael.morin@tele2.fr> PR fortran/37903 @@ -15,7 +13,6 @@ PR fortran/37749 * gfortran.dg/vector_subscript__5.f90: New test. ->>>>>>> .r141488 2008-10-30 Jakub Jelinek <jakub@redhat.com> * gcc.target/s390/pr36822.c: Avoid cast to pointer from integer |