Merge branch 'sb/string-list'

diff --git a/string-list.h b/string-list.h
index ee9b10097087b0e77c8d30ad8a24389d02538479..d3809a14172da5b1512b08fa411136821465659e 100644 (file)
--- a/string-list.h
+++ b/string-list.h
@@ -93,7 +93,7 @@ struct string_list_item *string_list_append(struct string_list *list, const char
  */
 struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
 
-void sort_string_list(struct string_list *list);
+void string_list_sort(struct string_list *list);
 int unsorted_string_list_has_string(struct string_list *list, const char *string);
 struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
                                                     const char *string);