aboutsummaryrefslogtreecommitdiff
path: root/gcc/ChangeLog.tuples
diff options
context:
space:
mode:
authorUros Bizjak <uros@gcc.gnu.org>2009-07-20 12:38:04 +0200
committerUros Bizjak <uros@gcc.gnu.org>2009-07-20 12:38:04 +0200
commit9e7c935a29fe3d44f60a40960ee4791aab285423 (patch)
tree028d13e74ccd0016d27652de0bebea0a0ea6282f /gcc/ChangeLog.tuples
parent6a799f6e68fcbd39c77f43524629183afc687202 (diff)
downloadgcc-9e7c935a29fe3d44f60a40960ee4791aab285423.zip
gcc-9e7c935a29fe3d44f60a40960ee4791aab285423.tar.gz
gcc-9e7c935a29fe3d44f60a40960ee4791aab285423.tar.bz2
ChangeLog: Remove conflict markers.
* ChangeLog: Remove conflict markers. * testsuite/ChangeLog: Ditto. From-SVN: r149805
Diffstat (limited to 'gcc/ChangeLog.tuples')
0 files changed, 0 insertions, 0 deletions