about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-23 20:05:25 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-23 20:05:25 -0700
commitdfb5cf8e4e332b41b5655b9c04885128713e842d (patch)
treed731a722c6d255f3a0422ac6d7e2a034c4e74563
parent1f0832d173341250ceb7fb99d932fd6459c66945 (diff)
parentccd0a08f4e1ac5323cb229fbd401b70e9473b64e (diff)
downloadglibc-dfb5cf8e4e332b41b5655b9c04885128713e842d.tar.gz
glibc-dfb5cf8e4e332b41b5655b9c04885128713e842d.tar.xz
glibc-dfb5cf8e4e332b41b5655b9c04885128713e842d.zip
Merge remote-tracking branch 'origin/master' into hjl/x32/master
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 71045dbd47..418d89738c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/x32/configure: New file.
+
 2012-05-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	mktime: avoid signed integer overflow