diff --git a/ChangeLog b/ChangeLog index c76cdd7a41..f3ebffb817 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-04 Ulrich Drepper + [BZ #5736] + * malloc/malloc.c: Fix typo in comment. + [BZ #5627] * locale/iso-639.def: Add Shuswap. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2a35fc65c3..342f49c911 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,13 @@ +2008-03-04 Ulrich Drepper + + * locales/en_CA: Add language information in LC_ADDRESS section. + * locales/fr_CA: Likewise. + * locales/ik_CA: Likewise. + * locales/iu_CA: Likewise. + + [BZ #5627] + * locales/shs_CA: New file. + 2008-01-10 Ulrich Drepper [BZ #5520] diff --git a/malloc/malloc.c b/malloc/malloc.c index e00eb0f4e2..7610aa444a 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1186,7 +1186,7 @@ void public_cFREe(); Malloc_trim returns 1 if it actually released any memory, else 0. On systems that do not support "negative sbrks", it will always - rreturn 0. + return 0. */ #if __STD_C int public_mTRIm(size_t);