summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 18:12:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 18:12:49 -0800
commit3cd02df46a56c5c006163e72d0816aef1ba4a00e (patch)
tree9deff1a112b92b5ada4717665071a44fcb8dc70f /Documentation/merge-config.txt
parentUpdate draft release notes to 1.7.0 (diff)
parentDo not use date.c:tm_to_time_t() from compat/mingw.c (diff)
downloadtgif-3cd02df46a56c5c006163e72d0816aef1ba4a00e.tar.xz
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 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions