diff options
| author | Joern Rennecke <amylaar@gcc.gnu.org> | 2013-11-11 18:40:04 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 2013-11-11 18:40:04 +0000 |
| commit | 213dba3e31cf2ef2d14827ba34a224ff2ae7f6cf (patch) | |
| tree | 6269ac323be70e3ff7d6bd1cb07493dfbf578c26 /gcc | |
| parent | 64c7b4c0c9bfd876bab126e7bc1861d1a39f1dbe (diff) | |
| download | gcc-213dba3e31cf2ef2d14827ba34a224ff2ae7f6cf.zip gcc-213dba3e31cf2ef2d14827ba34a224ff2ae7f6cf.tar.gz gcc-213dba3e31cf2ef2d14827ba34a224ff2ae7f6cf.tar.bz2 | |
Remove ChangeLog merge turd from r204590.
From-SVN: r204680
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7ceba70..b7a8ff8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -83,7 +83,6 @@ gcc.dg/c11-atomic-2.c, gcc.dg/c11-atomic-3.c, gcc.dg/c90-atomic-1.c, gcc.dg/c99-atomic-1.c: New tests. ->>>>>>> .r204589 2013-11-07 Cong Hou <congh@google.com> * gcc.dg/vect/vect-alias-check.c: New. |