OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
030ec15
)
Remove conflict marker.
author
schwab
<schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 20 Aug 2004 11:37:13 +0000
(11:37 +0000)
committer
schwab
<schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 20 Aug 2004 11:37:13 +0000
(11:37 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86312
138bc75d
-0d04-0410-961f-
82ee72b054a4
ChangeLog
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
8c8fd10
..
6976be8
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-45,7
+45,6
@@
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
->>>>>>> 1.967
2004-08-13 Brian Booth <bbooth@redhat.com>
* MAINTAINERS: Remove myself from write-after-approval.