diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 10:25:37 -0700 |
| commit | 19100d3f7db17a85dc58265ae5388b1bf483f44f (patch) | |
| tree | 914eee109f39d0cb47358770a5c4839a47976c46 /ll-merge.c | |
| parent | 7703477ab9fcb96ee1d2555c85b7499d8c3d69eb (diff) | |
| parent | dd4f30756150c921ce9acc7b3d0970ff5a6e1158 (diff) | |
| download | git-19100d3f7db17a85dc58265ae5388b1bf483f44f.tar.gz git-19100d3f7db17a85dc58265ae5388b1bf483f44f.tar.xz | |
Merge branch 'db/doc-custom-xmlto' into maint
* db/doc-custom-xmlto:
Documentation/Makefile: Allow custom XMLTO binary
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions