Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 00:01:31 +0000 (17:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 00:01:31 +0000 (17:01 -0700)
commit13c910b65f1d674984942ded3a3410140b110ba7
treebf1102a5996ea97edf4947016044f853335a9462
parent4fc77847c70f00e94586150f808d0418ca64bbb8
parent106a36509dc78e32e0b0e64c8da12ace639c879a
Merge branch 'master' into next

* master:
  commit.c: rename variable named 'n' which masks previous declaration
  abspath.c: move declaration of 'len' into inner block and use appropriate type
  Makefile: remove pointless conditional assignment in SunOS section
Makefile