Merge branch 'work/relative-paths' of git://repo.or.cz/msysgit into devel
commitbaa94345e2a0c526cb32654d91724ca0275d3053
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 31 May 2011 08:18:22 +0000 (31 10:18 +0200)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 31 May 2011 08:18:22 +0000 (31 10:18 +0200)
tree11dd44c38ed10ba7ca7730c152550c94eb16ae41
parentd38610f0cdce39982b54e762ddf4ef1c68cb9528
parent240a6c6c6be075082f2484630de3a4b1e5d5115a
Merge branch 'work/relative-paths' of git://repo.or.cz/msysgit into devel

Conflicts:
share/WinGit/copy-files.sh

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
share/WinGit/copy-files.sh