Merge branch 'maint-1.6.0' into maint

diff --git a/shortlog.h b/shortlog.h
index 6608ee80b08881146b2678dba3120a036b69cc28..bc02cc29ef0d5f640ab390614def995f30fe4691 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -1,10 +1,10 @@
 #ifndef SHORTLOG_H
 #define SHORTLOG_H
 
-#include "path-list.h"
+#include "string-list.h"
 
 struct shortlog {
-       struct path_list list;
+       struct string_list list;
        int summary;
        int wrap_lines;
        int sort_by_number;
@@ -15,7 +15,7 @@ struct shortlog {
 
        char *common_repo_prefix;
        int email;
-       struct path_list mailmap;
+       struct string_list mailmap;
 };
 
 void shortlog_init(struct shortlog *log);