aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-parser.c
diff options
context:
space:
mode:
authorUros Bizjak <uros@gcc.gnu.org>2008-03-10 14:33:07 +0100
committerUros Bizjak <uros@gcc.gnu.org>2008-03-10 14:33:07 +0100
commit3b509e336185d75d64ddba6e3866f1cfbc986111 (patch)
tree5de1395a8519747f4a32d5e94c95b0a800728632 /gcc/c-parser.c
parent9886a872b9837fecf3806cad9bbc7b19a2ced32f (diff)
downloadgcc-3b509e336185d75d64ddba6e3866f1cfbc986111.zip
gcc-3b509e336185d75d64ddba6e3866f1cfbc986111.tar.gz
gcc-3b509e336185d75d64ddba6e3866f1cfbc986111.tar.bz2
* ChangeLog: Remove merge marker.
From-SVN: r133077
Diffstat (limited to 'gcc/c-parser.c')
0 files changed, 0 insertions, 0 deletions