r263634 - in /branches/c++-name-lookup: ./ Chan...

[nathan@gcc.gnu.org]

Author: nathan
Date: Fri Aug 17 19:57:46 2018
New Revision: 263634

URL: https://gcc.gnu.org/viewcvs?rev=263634&root=gcc&view=rev
Log:
	Merge trunk r263622.

Modified:
    branches/c++-name-lookup/   (props changed)
    branches/c++-name-lookup/ChangeLog.name-lookup
    branches/c++-name-lookup/gcc/c-family/ChangeLog
    branches/c++-name-lookup/gcc/cp/decl.c
    branches/c++-name-lookup/gcc/cp/error.c
    branches/c++-name-lookup/gcc/cp/pt.c
    branches/c++-name-lookup/libcc1/libcp1plugin.cc
    branches/c++-name-lookup/libcpp/ChangeLog
    branches/c++-name-lookup/libcpp/include/line-map.h
    branches/c++-name-lookup/libcpp/line-map.c
    branches/c++-name-lookup/libcpp/macro.c

Propchange: branches/c++-name-lookup/
            ('svn:mergeinfo' modified)