Merge git://repo.or.cz/git-gui

diff --git a/sha1-array.h b/sha1-array.h
index 4499b5dad40924e9be2b6aacd73153326e6d11ec..72bb33bec6c173633c2b5cd04db57b562fa23a9e 100644 (file)
--- a/sha1-array.h
+++ b/sha1-array.h
@@ -11,7 +11,6 @@ struct sha1_array {
 #define SHA1_ARRAY_INIT { NULL, 0, 0, 0 }
 
 void sha1_array_append(struct sha1_array *array, const unsigned char *sha1);
-void sha1_array_sort(struct sha1_array *array);
 int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1);
 void sha1_array_clear(struct sha1_array *array);