summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-12-08 18:32:48 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-12-08 18:32:48 (UTC)
commitf4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) (unidiff)
tree432b3dc327e05220c6ac0aff9ca81cf38a47524c /cgit.h
parent57bb4fdb8419d7c250d4c6146910df3263943951 (diff)
parent735e15e38a484bf0daa98776fa7cde270a271cda (diff)
downloadcgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip
cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz
cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2
Merge branch 'ro/ssdiff'
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 39853df..5941ec0 100644
--- a/cgit.h
+++ b/cgit.h
@@ -143,6 +143,7 @@ struct cgit_query {
143 int nohead; 143 int nohead;
144 char *sort; 144 char *sort;
145 int showmsg; 145 int showmsg;
146 int ssdiff;
146}; 147};
147 148
148struct cgit_config { 149struct cgit_config {
@@ -195,6 +196,7 @@ struct cgit_config {
195 int summary_branches; 196 int summary_branches;
196 int summary_log; 197 int summary_log;
197 int summary_tags; 198 int summary_tags;
199 int ssdiff;
198 struct string_list mimetypes; 200 struct string_list mimetypes;
199 struct cgit_filter *about_filter; 201 struct cgit_filter *about_filter;
200 struct cgit_filter *commit_filter; 202 struct cgit_filter *commit_filter;