diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 16:14:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 16:14:07 -0700 |
| commit | 00f97c72f22b82c6c77ae429986060832c6b6f55 (patch) | |
| tree | eb28f42d27c94d3318d9c98fb5eae014b3de553a /compat | |
| parent | d265ddce1fe3860f67bfe5491dd75b0e657d9062 (diff) | |
| parent | bab39ed371145b83340750101e7ec85167845857 (diff) | |
| download | git-00f97c72f22b82c6c77ae429986060832c6b6f55.tar.gz git-00f97c72f22b82c6c77ae429986060832c6b6f55.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
GIT 1.6.1.4
Conflicts:
GIT-VERSION-GEN
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions