| 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) (side-by-side diff) | |
| 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
@@ -65,24 +65,25 @@ struct cgit_repo { char *desc; char *owner; char *defbranch; char *group; char *module_link; char *readme; char *clone_url; int snapshots; int enable_log_filecount; int enable_log_linecount; int max_stats; time_t mtime; + struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; }; struct cgit_repolist { int length; int count; struct cgit_repo *repos; }; struct commitinfo { struct commit *commit; @@ -179,24 +180,25 @@ struct cgit_config { int max_msg_len; int max_repodesc_len; int max_stats; int nocache; int noplainemail; int noheader; int renamelimit; int snapshots; int summary_branches; int summary_log; int summary_tags; struct string_list mimetypes; + struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; }; struct cgit_page { time_t modified; time_t expires; size_t size; char *mimetype; char *charset; char *filename; char *etag; |