projects
/
binutils-gdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35111bf
)
remove CVS conflict marker
author
Ian Lance Taylor
<ian@airs.com>
Wed, 24 Jun 1998 23:09:05 +0000
(23:09 +0000)
committer
Ian Lance Taylor
<ian@airs.com>
Wed, 24 Jun 1998 23:09:05 +0000
(23:09 +0000)
gas/ChangeLog
patch
|
blob
|
history
diff --git
a/gas/ChangeLog
b/gas/ChangeLog
index 4e314c465fad150800482b14a6b4688bf0f027bc..5648ee0c9694b0d26ea44e763adc8b634f6af46e 100644
(file)
--- a/
gas/ChangeLog
+++ b/
gas/ChangeLog
@@
-42,7
+42,6
@@
end-sanitize-v850e
* config/obj-coff.c (c_symbol_merge): Replace complex expresion
with call to macro SYM_AUXINFO.
->>>>>>> 1.2596
Tue Jun 23 15:09:27 1998 Mike Stump <mrs@wrs.com>
* Makefile.am (install-exec-local): Don't let EXEEXT interfere