CVSROOT: /cvs/gcc Module name: gcc Branch: hammer-3_3-branch Changes by: hubicka@gcc.gnu.org 2004-01-14 13:34:14 Modified files: gcc/cp : semantics.c Log message: Fix merging conflict. Patches: http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/cp/semantics.c.diff?cvsroot=gcc&only_with_tag=hammer-3_3-branch&r1=1.282.2.11&r2=1.282.2.12