r219135 - /branches/google/gcc-4_9/gcc/cfg-flag...

[wmi@gcc.gnu.org]

Author: wmi
Date: Thu Jan  1 05:58:16 2015
New Revision: 219135

URL: https://gcc.gnu.org/viewcvs?rev=219135&root=gcc&view=rev
Log:
Fix a merge conflict.

Modified:
    branches/google/gcc-4_9/gcc/cfg-flags.def