| commit | 8aba13b51f223590408090c71d5dfccce07facdc | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Sat, 27 Feb 2016 04:51:46 +0000 (26 20:51 -0800) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Sat, 27 Feb 2016 04:51:46 +0000 (26 20:51 -0800) | ||
| tree | 53c1e84779ae89a646f04aaaaca7fb6349cfef63 | treesnapshot (tar.gz zip) |
| parent | 95b43676c30011d1e9eeaef3d9487d135260d3c0 | commitdiff |
| parent | b170a0aad5813e9e6ec22c39aa101b705d9b085f | commitdiff |
Merge branch 'master' into elfmerge
Resolved Conflicts:
output/outmacho.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
output/outmacho.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| output/outmacho.c | diff1 | diff2 | blobhistory |