Forgot to commit yesterday.

From-SVN: r92147

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d94cb679d0eb6fa0e3d054f3a90746388625d21b..9a15271da22d69685c76edea72f7955cbea4171a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,10 @@
        PR c++/18949
        * g++.dg/template/cast1.C: New.
 
+2004-12-13  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * gcc.c-torture/execute/20041213-1.c: New test.
+
 2004-12-13  Richard Henderson  <rth@redhat.com>
 
        * gcc.dg/i386-sse-10.c: Fix typo in options.
@@ -67,6 +71,7 @@
        PR middle-end/18903
        * gcc.c-torture/compile/pr18903.c: New test.
 
+>>>>>>> 1.4750
 2004-12-10  Richard Sandiford  <rsandifo@redhat.com>
 
        * gcc.c-torture/execute/20041210-1.c: New test.