Merge branch 'jn/make-assembly-in-right-directory' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:38 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:38 +0000 (15:39 -0700)
* jn/make-assembly-in-right-directory:
  Makefile: fix location of listing produced by "make subdir/foo.s"

1  2 
Makefile

diff --cc Makefile
Simple merge