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)
commitdbf64e125a96cd9e6de401361613e8dc888c65ee
tree791b781c1994958bc83135cf75e3832fbccd3ea7
parentc2e585f530e6339ff3eab0405de6286b7f929b28
parent1015cc4225542ba69cf1627a743978f304a29c71
Merge branch 'jn/make-assembly-in-right-directory' into maint

* jn/make-assembly-in-right-directory:
  Makefile: fix location of listing produced by "make subdir/foo.s"
Makefile