r217103 - in /branches/c++-concepts: ChangeLog....

[jason@gcc.gnu.org]

Author: jason
Date: Tue Nov  4 22:32:30 2014
New Revision: 217103

URL: https://gcc.gnu.org/viewcvs?rev=217103&root=gcc&view=rev
Log:
	* gcc/cp/parser.c (cp_parser_nonclass_name): Fix merge error.

Modified:
    branches/c++-concepts/ChangeLog.concepts
    branches/c++-concepts/gcc/cp/parser.c