Merge refs/heads/master from .

diff --git a/setup.c b/setup.c
index 1710b1685463e481d1c7ff5471bee6774d4b9c32..b8789de5c523d72110187960fb887852732f8486 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-static char *prefix_path(const char *prefix, int len, char *path)
+char *prefix_path(const char *prefix, int len, char *path)
 {
        char *orig = path;
        for (;;) {