From 0c690ca7afabc675d06b5b4f86899eff827c8eb9 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu@cs.umass.edu>
Date: Tue, 14 Dec 2004 10:45:37 -0700
Subject: [PATCH] Forgot to commit yesterday.

From-SVN: r92147
---
 gcc/testsuite/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d94cb679d0e..9a15271da22 100644
--- 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.
-- 
2.30.2