Merge branch 'rs/maint-1.6.0-windows-ceiling' into next
commit547ef8bf422c9b234e52eefa318a6d7cf932c1e3
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 08:03:41 +0000 (6 00:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 08:03:41 +0000 (6 00:03 -0800)
treee71be664a1710b650e049bd459787b066c9055f3
parent6f7f578c7fe9e1b05b4ad6935502e91aee293694
parentc06ecf51b47056d3327dacdb9a5cb543bf22ce77
Merge branch 'rs/maint-1.6.0-windows-ceiling' into next

* rs/maint-1.6.0-windows-ceiling:
  fix t1504 on Windows
cache.h
path.c
setup.c