2003-06-30 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* Changelog: Remove ">>>>>>>" from previous change.
* testsuite/Changelog: Likewise.
From-SVN: r68741
+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.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
+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".
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.