r176170 - in /branches/gomp-3_1-branch: gcc/omp...

[jakub@gcc.gnu.org]

Author: jakub
Date: Mon Jul 11 17:29:17 2011
New Revision: 176170

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=176170
Log:
Fix svn merge -r170466:176160 svn+ssh://gcc.gnu.org/svn/gcc/trunk merge glitches.

Modified:
    branches/gomp-3_1-branch/gcc/omp-low.c
    branches/gomp-3_1-branch/libgomp/testsuite/libgomp.fortran/task4.f90