author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:46:34 (UTC) |
commit | db8b8cb9467625cb8d9ecb67863aa67590e59cc0 (patch) (unidiff) | |
tree | d27644fc1b98ec6365e74f3ba40c19f78f8a287f /cgit.h | |
parent | db6303b58883c4417f5bcc0c1ee34fed6553dca3 (diff) | |
parent | 537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (diff) | |
download | cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.zip cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.gz cgit-db8b8cb9467625cb8d9ecb67863aa67590e59cc0.tar.bz2 |
Merge branch 'lh/about'
Conflicts:
cgit.h
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -71,12 +71,13 @@ struct cgit_repo { | |||
71 | char *clone_url; | 71 | char *clone_url; |
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 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 | }; |
80 | 81 | ||
81 | struct cgit_repolist { | 82 | struct cgit_repolist { |
82 | int length; | 83 | int length; |
@@ -185,12 +186,13 @@ struct cgit_config { | |||
185 | int renamelimit; | 186 | int renamelimit; |
186 | int snapshots; | 187 | int snapshots; |
187 | int summary_branches; | 188 | int summary_branches; |
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 | }; |
194 | 196 | ||
195 | struct cgit_page { | 197 | struct cgit_page { |
196 | time_t modified; | 198 | time_t modified; |