43b96a4eb5
conflicts for a git rebase I tried to do. |
||
---|---|---|
.. | ||
concatdb.sh | ||
fastfind.c | ||
locate.1 | ||
locate.c | ||
locate.h | ||
locate.rc | ||
locate.updatedb.8 | ||
Makefile | ||
Makefile.depend | ||
mklocatedb.sh | ||
pathnames.h | ||
updatedb.sh | ||
util.c |
43b96a4eb5
conflicts for a git rebase I tried to do. |
||
---|---|---|
.. | ||
concatdb.sh | ||
fastfind.c | ||
locate.1 | ||
locate.c | ||
locate.h | ||
locate.rc | ||
locate.updatedb.8 | ||
Makefile | ||
Makefile.depend | ||
mklocatedb.sh | ||
pathnames.h | ||
updatedb.sh | ||
util.c |