summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-03-04 18:36:27 +0000
committerUlrich Drepper <drepper@redhat.com>2008-03-04 18:36:27 +0000
commitc958a6a4e50ac7ca8d72e518825a474d17850119 (patch)
treeecd6b625814eafc02278be37bde382eebb5a024b
parentd835f13696fd65d38da66ef79ba5f045046fc88f (diff)
[BZ #5736]
* malloc/malloc.c: Fix typo in comment.
-rw-r--r--ChangeLog3
-rw-r--r--localedata/ChangeLog10
-rw-r--r--malloc/malloc.c2
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c76cdd7a41..f3ebffb817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-03-04 Ulrich Drepper <drepper@redhat.com>
+ [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 <drepper@redhat.com>
+
+ * 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 <drepper@redhat.com>
[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);