author | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 16:46:17 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 16:46:17 (UTC) |
commit | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (patch) (unidiff) | |
tree | 899ecd47f770b1909d107b0f1c777e8b032b25fc /cgit.h | |
parent | e76a1ea427792aaa331cdec70d7d4ff1fb3422e0 (diff) | |
parent | 797110e39d5d433638c82cf27d584ed9b8b93bb7 (diff) | |
download | cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.zip cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.gz cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.bz2 |
Merge branch 'lh/section-from-path'
Conflicts:
scan-tree.c
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -185,48 +185,49 @@ struct cgit_config { | |||
185 | int cache_static_ttl; | 185 | int cache_static_ttl; |
186 | int embedded; | 186 | int embedded; |
187 | int enable_filter_overrides; | 187 | int enable_filter_overrides; |
188 | int enable_gitweb_owner; | 188 | int enable_gitweb_owner; |
189 | int enable_index_links; | 189 | int enable_index_links; |
190 | int enable_log_filecount; | 190 | int enable_log_filecount; |
191 | int enable_log_linecount; | 191 | int enable_log_linecount; |
192 | int enable_remote_branches; | 192 | int enable_remote_branches; |
193 | int enable_subject_links; | 193 | int enable_subject_links; |
194 | int enable_tree_linenumbers; | 194 | int enable_tree_linenumbers; |
195 | int local_time; | 195 | int local_time; |
196 | int max_atom_items; | 196 | int max_atom_items; |
197 | int max_repo_count; | 197 | int max_repo_count; |
198 | int max_commit_count; | 198 | int max_commit_count; |
199 | int max_lock_attempts; | 199 | int max_lock_attempts; |
200 | int max_msg_len; | 200 | int max_msg_len; |
201 | int max_repodesc_len; | 201 | int max_repodesc_len; |
202 | int max_blob_size; | 202 | int max_blob_size; |
203 | int max_stats; | 203 | int max_stats; |
204 | int nocache; | 204 | int nocache; |
205 | int noplainemail; | 205 | int noplainemail; |
206 | int noheader; | 206 | int noheader; |
207 | int renamelimit; | 207 | int renamelimit; |
208 | int remove_suffix; | 208 | int remove_suffix; |
209 | int section_from_path; | ||
209 | int snapshots; | 210 | int snapshots; |
210 | int summary_branches; | 211 | int summary_branches; |
211 | int summary_log; | 212 | int summary_log; |
212 | int summary_tags; | 213 | int summary_tags; |
213 | int ssdiff; | 214 | int ssdiff; |
214 | struct string_list mimetypes; | 215 | struct string_list mimetypes; |
215 | struct cgit_filter *about_filter; | 216 | struct cgit_filter *about_filter; |
216 | struct cgit_filter *commit_filter; | 217 | struct cgit_filter *commit_filter; |
217 | struct cgit_filter *source_filter; | 218 | struct cgit_filter *source_filter; |
218 | }; | 219 | }; |
219 | 220 | ||
220 | struct cgit_page { | 221 | struct cgit_page { |
221 | time_t modified; | 222 | time_t modified; |
222 | time_t expires; | 223 | time_t expires; |
223 | size_t size; | 224 | size_t size; |
224 | char *mimetype; | 225 | char *mimetype; |
225 | char *charset; | 226 | char *charset; |
226 | char *filename; | 227 | char *filename; |
227 | char *etag; | 228 | char *etag; |
228 | char *title; | 229 | char *title; |
229 | int status; | 230 | int status; |
230 | char *statusmsg; | 231 | char *statusmsg; |
231 | }; | 232 | }; |
232 | 233 | ||