r124430 - in /branches/dataflow-branch/gcc: bas...

[zadeck@gcc.gnu.org]

Author: zadeck
Date: Fri May  4 15:29:15 2007
New Revision: 124430

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=124430
Log:
fixed merge problems

Modified:
    branches/dataflow-branch/gcc/basic-block.h
    branches/dataflow-branch/gcc/cfglayout.c
    branches/dataflow-branch/gcc/df-scan.c