diff options
| author | meissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-22 23:45:47 +0000 |
|---|---|---|
| committer | meissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-10-22 23:45:47 +0000 |
| commit | 90a2bd3a18cfb0ff626ce9e79a17e8f6771433c7 (patch) | |
| tree | 3be3c92b5d42e9eaeba4a567763d242ab20c8faf | |
| parent | 658f802b2b7f7a08a31ff7a6faecf3d8e639790b (diff) | |
Fix broken ChangeLog
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ibm/gcc-4_3-branch@153483 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog.ibm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog.ibm b/gcc/testsuite/ChangeLog.ibm index 7c95024a8d9..5a52edd6ce7 100644 --- a/gcc/testsuite/ChangeLog.ibm +++ b/gcc/testsuite/ChangeLog.ibm @@ -1,10 +1,8 @@ -<<<<<<< .mine 2009-10-22 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/41787 * gcc.target/powerpc/vsx-vrsave.c: New file. -======= 2009-10-22 Janis Johnson <janis187@us.ibm.com> Backport from 4.3 branch: @@ -13,7 +11,6 @@ PR c/41049 * gcc.dg/dfp/pr41049.c: New test. ->>>>>>> .r153481 2009-10-15 Michael Meissner <meissner@linux.vnet.ibm.com> * gcc.target/powerpc/altivec-4.c (b): Make sure altivec builtin |