Merge branch 'stable'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index ada85359302889fdc1c37fc012ea49b84fbbb47c..8f5dd2a7f2046eaca5b7eda311efa093f6f0f664 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -19,6 +19,7 @@
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
+#include <notes.h>
 
 
 /*
@@ -167,6 +168,7 @@ struct cgit_config {
        char *logo_link;
        char *module_link;
        char *project_list;
+       char *readme;
        char *robots;
        char *root_title;
        char *root_desc;
@@ -183,6 +185,7 @@ struct cgit_config {
        int cache_static_ttl;
        int embedded;
        int enable_filter_overrides;
+       int enable_gitweb_owner;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
@@ -203,6 +206,7 @@ struct cgit_config {
        int noheader;
        int renamelimit;
        int remove_suffix;
+       int section_from_path;
        int snapshots;
        int summary_branches;
        int summary_log;
@@ -291,6 +295,7 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
+__attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);