diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 19:58:03 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 19:58:03 -0700 |
commit | ccd969f5868c18a1d59444769d1f4d6e3408cc21 (patch) | |
tree | abf62284685a94ebcdda58bc5ac8b18035c37822 /COPYING | |
parent | 8de69b8360cdb7c2bb787fe343bc46c23aeb57c4 (diff) | |
parent | 118759a5bfa9a027617ef7c5dac3fa0daf1e824c (diff) | |
download | glibc-ccd969f5868c18a1d59444769d1f4d6e3408cc21.tar.gz glibc-ccd969f5868c18a1d59444769d1f4d6e3408cc21.tar.xz glibc-ccd969f5868c18a1d59444769d1f4d6e3408cc21.zip |
Merge remote-tracking branch 'origin/hjl/abi' into hjl/x32/master
Conflicts: sysdeps/unix/sysv/linux/x86_64/Makefile
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions