diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 18:23:24 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 18:23:24 (GMT) |
commit | da34dd49bb8c9bdab5bf98f463d5b3453976db9b (patch) | |
tree | 70e6c99b288f07183c32b13e3b9758d2e491b03d /Documentation/merge-config.txt | |
parent | cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147 (diff) | |
parent | fdb1fbbc7d313253ca9fac5b0be3d0573dcb5419 (diff) | |
download | git-da34dd49bb8c9bdab5bf98f463d5b3453976db9b.zip git-da34dd49bb8c9bdab5bf98f463d5b3453976db9b.tar.gz git-da34dd49bb8c9bdab5bf98f463d5b3453976db9b.tar.bz2 |
Merge branch 'es/make-no-iconv'
"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
(i.e. linkage of -lintl, -liconv, etc. that are platform-specific
tweaks), which has been corrected.
* es/make-no-iconv:
Makefile: make NO_ICONV really mean "no iconv"
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions