diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
| commit | 7be2b6e02b4f2a1b4812764f65b12cafb11a934e (patch) | |
| tree | c94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660 /config.mak.in | |
| parent | Documentation: describe -w/--web option to "git-help". (diff) | |
| parent | Update draft Release Notes for 1.5.4 (diff) | |
| download | tgif-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.tar.xz | |
Merge branch 'master' into cc/help
This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
Diffstat (limited to 'config.mak.in')
| -rw-r--r-- | config.mak.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in index 11d256e9cf..7d5df9bf3c 100644 --- a/config.mak.in +++ b/config.mak.in @@ -41,4 +41,5 @@ NO_STRTOUMAX=@NO_STRTOUMAX@ NO_SETENV=@NO_SETENV@ NO_MKDTEMP=@NO_MKDTEMP@ NO_ICONV=@NO_ICONV@ +OLD_ICONV=@OLD_ICONV@ NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@ |