summaryrefslogtreecommitdiff
path: root/gcc/config/rs6000/rs6000.h
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-10 21:33:06 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-10 21:33:06 +0000
commit7f646368a7a7679a8c4a349c4130b49d9a64d9cd (patch)
tree842160f675cd6bab12bd57cf9955651e30864b78 /gcc/config/rs6000/rs6000.h
parentfe34354e72b674130ffcf5a67e2d0b3b7307383e (diff)
downloadgcc-7f646368a7a7679a8c4a349c4130b49d9a64d9cd.tar.gz
Resolve merge conflict.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@207670 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/rs6000/rs6000.h')
0 files changed, 0 insertions, 0 deletions