Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:29 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:29 +0000 (22:51 -0700)
* ph/builtin-srcs-are-in-subdir-these-days:
  fix "builtin-*" references to be "builtin/*"

1  2 
Documentation/git-log.txt
Documentation/technical/api-builtin.txt
Documentation/technical/api-parse-options.txt
Documentation/user-manual.txt
builtin/help.c
builtin/notes.c
transport.c
transport.h

Simple merge
Simple merge
diff --cc builtin/help.c
Simple merge
diff --cc builtin/notes.c
Simple merge
diff --cc transport.c
Simple merge
diff --cc transport.h
Simple merge