summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorLars Hjemli <hjemli@gmail.com>2009-12-08 18:34:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-12-08 18:34:30 (UTC)
commit4e75d7c9b93010663963d362099777b77a67c446 (patch) (unidiff)
treeb36c95b774e31bd4bb3bcde0123d6522719b7a5a /cgit.h
parentf4f6210b4f9c214dc247567bbd06b1135c9ecd06 (diff)
parent41934a3222cd3e5a5f214e4275929519c70d311d (diff)
downloadcgit-4e75d7c9b93010663963d362099777b77a67c446.zip
cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.gz
cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.bz2
Merge branch 'lh/remote-branches'
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 5941ec0..cd4af72 100644
--- a/cgit.h
+++ b/cgit.h
@@ -72,6 +72,7 @@ struct cgit_repo {
72 int snapshots; 72 int snapshots;
73 int enable_log_filecount; 73 int enable_log_filecount;
74 int enable_log_linecount; 74 int enable_log_linecount;
75 int enable_remote_branches;
75 int max_stats; 76 int max_stats;
76 time_t mtime; 77 time_t mtime;
77 struct cgit_filter *about_filter; 78 struct cgit_filter *about_filter;
@@ -179,6 +180,7 @@ struct cgit_config {
179 int enable_index_links; 180 int enable_index_links;
180 int enable_log_filecount; 181 int enable_log_filecount;
181 int enable_log_linecount; 182 int enable_log_linecount;
183 int enable_remote_branches;
182 int enable_tree_linenumbers; 184 int enable_tree_linenumbers;
183 int local_time; 185 int local_time;
184 int max_repo_count; 186 int max_repo_count;