diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-10 13:56:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 13:56:20 -0700 |
| commit | b281eea75f0ab68e3c9510323c73b78cd3e62814 (patch) | |
| tree | d2038eadf370012addf920249883e15e6bfba69a /compat | |
| parent | da06a80322a2357b8b5b6ddb8b5648f97ed73e83 (diff) | |
| parent | 873358dd2ac3bf2cea9a370d8586378a27a092f2 (diff) | |
| download | git-b281eea75f0ab68e3c9510323c73b78cd3e62814.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.0.2
Use compatibility regex library for OSX/Darwin
git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
Git.pm: Use File::Temp->tempfile instead of ->new
t7501: always use test_cmp instead of diff
Conflicts:
Makefile
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/fnmatch/fnmatch.c (renamed from compat/fnmatch.c) | 0 | ||||
| -rw-r--r-- | compat/fnmatch/fnmatch.h (renamed from compat/fnmatch.h) | 0 | ||||
| -rw-r--r-- | compat/regex/regex.c (renamed from compat/regex.c) | 0 | ||||
| -rw-r--r-- | compat/regex/regex.h (renamed from compat/regex.h) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/compat/fnmatch.c b/compat/fnmatch/fnmatch.c index 1f4ead5f98..1f4ead5f98 100644 --- a/compat/fnmatch.c +++ b/compat/fnmatch/fnmatch.c diff --git a/compat/fnmatch.h b/compat/fnmatch/fnmatch.h index cc3ec37940..cc3ec37940 100644 --- a/compat/fnmatch.h +++ b/compat/fnmatch/fnmatch.h diff --git a/compat/regex.c b/compat/regex/regex.c index 87b33e4669..87b33e4669 100644 --- a/compat/regex.c +++ b/compat/regex/regex.c diff --git a/compat/regex.h b/compat/regex/regex.h index 6eb64f1402..6eb64f1402 100644 --- a/compat/regex.h +++ b/compat/regex/regex.h |