[BZ #5736]

* malloc/malloc.c: Fix typo in comment.
git-mirror · Mar 4, 2008 · c958a6a · c958a6a
1 parent d835f13
commit c958a6a
Showing 3 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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);