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
@@ -76,2 +76,3 @@ struct cgit_repo { time_t mtime; + struct cgit_filter *about_filter; struct cgit_filter *commit_filter; @@ -190,2 +191,3 @@ struct cgit_config { struct string_list mimetypes; + struct cgit_filter *about_filter; struct cgit_filter *commit_filter; |