| commit | 28ec7d1ddfbf3f1d01a03c772132ba1b9fa08d50 | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 18 Feb 2016 21:57:03 +0000 (18 13:57 -0800) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 18 Feb 2016 21:57:03 +0000 (18 13:57 -0800) | ||
| tree | 78c747dbb61d136f168b5e86f7076d2ec9e834a6 | treesnapshot (tar.gz zip) |
| parent | 2530a10b56a2eb9838d4f2ecf8b50f4cbb917919 | commitdiff |
| parent | 114ba75f7bb6dbd935b8b72537544d8e8ec49716 | commitdiff |
Merge branch 'master' into elfmerge
Resolved Conflicts:
configure.in
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
configure.in
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| compiler.h | diff1 | diff2 | blobhistory |
| configure.in | diff1 | diff2 | blobhistory |
| output/outmacho.c | diff1 | diff2 | blobhistory |