summaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:18 (GMT)
commitff0a181fa6580d29ce0ab7abf79780a1fa3c5555 (patch)
treefab0521bc4c6168b85108e033c4601b25753f0e9 /builtin/notes.c
parent0acb62f202617cc58b6b4039dc9c7ad955ef0c88 (diff)
parente07665e524d0398a34059d605f674182bfeeaf39 (diff)
downloadgit-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.zip
git-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.tar.gz
git-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.tar.bz2
Merge branch 'maint'
* maint: Prepare for 1.7.0.4 Conflicts: RelNotes
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions