Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket...
commit64d63240762df22e92b287b145d75a0d68a66988
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 17 Feb 2014 18:42:40 +0000 (17 12:42 -0600)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 17 Feb 2014 18:42:40 +0000 (17 12:42 -0600)
tree5dc230c5bc350144ba70a9f38002f8308f8d224d
parent3acbf28e1562f7446187dccc70e780a343fc222c
parentd02af3a6811f5f4b90c9edd508c2e9246fcd0e14
Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket-1.8.5.2
Documentation/config.txt
Makefile
compat/mingw.c
config.mak.uname