summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-08-09 11:46:34 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-09 11:46:34 (UTC)
commitdb8b8cb9467625cb8d9ecb67863aa67590e59cc0 (patch) (unidiff)
treed27644fc1b98ec6365e74f3ba40c19f78f8a287f /cgit.h
parentdb6303b58883c4417f5bcc0c1ee34fed6553dca3 (diff)
parent537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (diff)
downloadcgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.zip
cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.gz
cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.bz2
Merge branch 'lh/about'
Conflicts: cgit.h
Diffstat (limited to 'cgit.h') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index b8557ac..4c854ea 100644
--- a/cgit.h
+++ b/cgit.h
@@ -74,6 +74,7 @@ struct cgit_repo {
74 int enable_log_linecount; 74 int enable_log_linecount;
75 int max_stats; 75 int max_stats;
76 time_t mtime; 76 time_t mtime;
77 struct cgit_filter *about_filter;
77 struct cgit_filter *commit_filter; 78 struct cgit_filter *commit_filter;
78 struct cgit_filter *source_filter; 79 struct cgit_filter *source_filter;
79}; 80};
@@ -188,6 +189,7 @@ struct cgit_config {
188 int summary_log; 189 int summary_log;
189 int summary_tags; 190 int summary_tags;
190 struct string_list mimetypes; 191 struct string_list mimetypes;
192 struct cgit_filter *about_filter;
191 struct cgit_filter *commit_filter; 193 struct cgit_filter *commit_filter;
192 struct cgit_filter *source_filter; 194 struct cgit_filter *source_filter;
193}; 195};