diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:12:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:12:49 -0800 |
| commit | 3cd02df46a56c5c006163e72d0816aef1ba4a00e (patch) | |
| tree | 9deff1a112b92b5ada4717665071a44fcb8dc70f /ll-merge.c | |
| parent | ff6d26a0e1d8fad775010fa3b689c0c027da8bb0 (diff) | |
| parent | a6d15bc33529f923b205930d0a58fe6226570dc1 (diff) | |
| download | git-3cd02df46a56c5c006163e72d0816aef1ba4a00e.tar.gz | |
Merge branch 'js/windows'
* js/windows:
Do not use date.c:tm_to_time_t() from compat/mingw.c
MSVC: Windows-native implementation for subset of Pthreads API
MSVC: Fix an "incompatible pointer types" compiler warning
Windows: avoid the "dup dance" when spawning a child process
Windows: simplify the pipe(2) implementation
Windows: boost startup by avoiding a static dependency on shell32.dll
Windows: disable Python
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions