diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:32 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 10:18:32 -0700 |
| commit | 635536488c3efcf8495333b6a94e3e33c36fc055 (patch) | |
| tree | dbe59109f95a57e008933d56ab28e72c7ae410ec /Makefile | |
| parent | 749bc58c5eab5b6947d2c01e02d12320005eba99 (diff) | |
| parent | 44c33a5b9603fba7c9556512a72e4e392ba4ae2d (diff) | |
| download | git-635536488c3efcf8495333b6a94e3e33c36fc055.tar.gz git-635536488c3efcf8495333b6a94e3e33c36fc055.tar.xz | |
Merge branch 'maint'
* maint:
builtin-apply: fix typo leading to stack corruption
git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
builtin-merge.c: allocate correct amount of memory
Makefile: do not set NEEDS_LIBICONV for Solaris 8
rebase -i: remove leftover debugging
rebase -i: proper prepare-commit-msg hook argument when squashing
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -650,7 +650,6 @@ ifeq ($(uname_S),SunOS) NO_MKDTEMP = YesPlease OLD_ICONV = UnfortunatelyYes ifeq ($(uname_R),5.8) - NEEDS_LIBICONV = YesPlease NO_UNSETENV = YesPlease NO_SETENV = YesPlease NO_C99_FORMAT = YesPlease |