diff options
Diffstat (limited to 'trunk/ChangeLog.cross')
| -rw-r--r-- | trunk/ChangeLog.cross | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/trunk/ChangeLog.cross b/trunk/ChangeLog.cross index 557ce43..520e18e 100644 --- a/trunk/ChangeLog.cross +++ b/trunk/ChangeLog.cross @@ -1,3 +1,9 @@ +2010-06-15 Mark Hatle <mark.hatle@windriver.com> + * Merge to upstream r174 + * src/arch-mips.c, src/conflict.c, src/cxx.c, src/main.c, src/verify.c: + fix items missed in the merge + * Resync dso-readonly.c from dso.c + 2010-06-14 Mark Hatle <mark.hatle@windriver.com> * Integrate prelinker/cross-prelinking patches |