summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-18 21:18:49 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-18 21:18:49 -0700
commit64e86c57867593ba0ee77a7b0ff0eb8e9d4d8ed5 (patch)
tree44501a655ab31b3d60cacd0dc9e6ec6e3ec37d32 /merge-index.c
parentMerge branch 'jc/shared' (diff)
parentauto-detect changed prefix and/or changed build flags (diff)
downloadtgif-64e86c57867593ba0ee77a7b0ff0eb8e9d4d8ed5.tar.xz
Merge branch 'yl/build'
* yl/build: auto-detect changed prefix and/or changed build flags
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions