r229996 - in /branches/gomp-4_0-branch: ./ gcc/...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Mon Nov  9 09:07:26 2015
New Revision: 229996

URL: https://gcc.gnu.org/viewcvs?rev=229996&root=gcc&view=rev
Log:
svn merge -r 229816:229831 svn+ssh://gcc.gnu.org/svn/gcc/trunk

Added:
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice15.C
      - copied unchanged from r229831, trunk/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice15.C
    branches/gomp-4_0-branch/gcc/testsuite/g++.dg/warn/Wplacement-new-size.C
      - copied unchanged from r229831, trunk/gcc/testsuite/g++.dg/warn/Wplacement-new-size.C
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/ifcvt-4.c
      - copied unchanged from r229831, trunk/gcc/testsuite/gcc.dg/ifcvt-4.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/pr68090.c
      - copied unchanged from r229831, trunk/gcc/testsuite/gcc.dg/pr68090.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/pr68112.c
      - copied unchanged from r229831, trunk/gcc/testsuite/gcc.dg/pr68112.c
    branches/gomp-4_0-branch/gcc/testsuite/gcc.dg/vect/vect-strided-shift-1.c
      - copied unchanged from r229831, trunk/gcc/testsuite/gcc.dg/vect/vect-strided-shift-1.c
Modified:
    branches/gomp-4_0-branch/   (props changed)
    branches/gomp-4_0-branch/gcc/ChangeLog
    branches/gomp-4_0-branch/gcc/DATESTAMP
    branches/gomp-4_0-branch/gcc/c-family/ChangeLog
    branches/gomp-4_0-branch/gcc/c-family/c.opt
    branches/gomp-4_0-branch/gcc/c/ChangeLog
    branches/gomp-4_0-branch/gcc/c/c-parser.c
    branches/gomp-4_0-branch/gcc/cp/ChangeLog
    branches/gomp-4_0-branch/gcc/cp/init.c
    branches/gomp-4_0-branch/gcc/cp/parser.c
    branches/gomp-4_0-branch/gcc/cp/typeck2.c
    branches/gomp-4_0-branch/gcc/doc/invoke.texi
    branches/gomp-4_0-branch/gcc/ifcvt.c
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog
    branches/gomp-4_0-branch/gcc/tree-scalar-evolution.c

Propchange: branches/gomp-4_0-branch/
            ('svn:mergeinfo' modified)