diff options
| author | Volker Reichelt <reichelt@gcc.gnu.org> | 2003-06-30 21:17:05 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2003-06-30 21:17:05 +0000 |
| commit | f11c1f9089ef8be8221062cdd6ced02f84d8d9a4 (patch) | |
| tree | eccc17d080926e66c1d79ce4adaf8ed340da9b6f /gcc | |
| parent | 109b748d3f13dcef66ca77f51bd779271b40d1f0 (diff) | |
| download | gcc-f11c1f9089ef8be8221062cdd6ced02f84d8d9a4.zip gcc-f11c1f9089ef8be8221062cdd6ced02f84d8d9a4.tar.gz gcc-f11c1f9089ef8be8221062cdd6ced02f84d8d9a4.tar.bz2 | |
Changelog: Remove ">>>>>>>" from previous change.
2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* Changelog: Remove ">>>>>>>" from previous change.
* testsuite/Changelog: Likewise.
From-SVN: r68741
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2f9b277..e55de49 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * Changelog: Remove ">>>>>>>" from previous change. + +2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * config/cris/cris.c: Fix spelling for "testcase". * config/cris/cris.h: Likewise. * config/cris/cris.md: Likewise. @@ -164,7 +168,6 @@ Mon Jun 30 09:52:39 CEST 2003 Jan Hubicka <jh@suse.cz> * config.gcc (sh*-*-kaos*): Put tm_file setting in separate case statement from tmake_file set. ->>>>>>> 2.268 2003-06-29 James E Wilson <wilson@tuliptree.org> * reload.c (find_reloads): Change push_reloads to push_reload in diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 593a2a4..5d0d274 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * Changelog: Remove ">>>>>>>" from previous change. + +2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * g++.old-deja/g++.niklas/README: Fix spelling for "testcase". * g++.old-deja/g++.other/access2.C: Likewise. * g++.old-deja/g++.other/decl2.C: Likewise. @@ -24,7 +28,6 @@ PR c++/11106 * g++.dg/other/error5.C: New test. ->>>>>>> 1.2819 2003-06-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * gcc.dg/format/gcc_diag-1.c: New test. |