diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2016-02-26 20:51:46 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2016-02-26 20:51:46 -0800 |
| commit | 8aba13b51f223590408090c71d5dfccce07facdc (patch) | |
| tree | 53c1e84779ae89a646f04aaaaca7fb6349cfef63 /version | |
| parent | 95b43676c30011d1e9eeaef3d9487d135260d3c0 (diff) | |
| parent | b170a0aad5813e9e6ec22c39aa101b705d9b085f (diff) | |
| download | nasm-elfmerge.tar.gz | |
Merge branch 'master' into elfmergeelfmerge
Resolved Conflicts:
output/outmacho.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'version')
| -rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -2.12rc6 +2.12 |