Merge branch 'jc/make-tags'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:35 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:35 +0000 (16:04 -0700)
* jc/make-tags:
  Makefile: ask "ls-files" to list source files if available

1  2 
Makefile

diff --cc Makefile
Simple merge