author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:45:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:45:36 (UTC) |
commit | 17e3ff42646f182911fd0e5d872082977538db9e (patch) (unidiff) | |
tree | 6fedf480751b534ac11066dd143fd0589cad284a /cgit.h | |
parent | b4c3562f57c924866314d0f80f46dddecd4ce61a (diff) | |
parent | c4d46c7035d07070ac1ebf0c0b44df927358687f (diff) | |
download | cgit-17e3ff42646f182911fd0e5d872082977538db9e.zip cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.gz cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.bz2 |
Merge branch 'lh/mimetypes'
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -10,16 +10,17 @@ | |||
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <string-list.h> | ||
18 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
19 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
20 | #include <utf8.h> | 21 | #include <utf8.h> |
21 | 22 | ||
22 | 23 | ||
23 | /* | 24 | /* |
24 | * Dateformats used on misc. pages | 25 | * Dateformats used on misc. pages |
25 | */ | 26 | */ |
@@ -170,16 +171,17 @@ struct cgit_config { | |||
170 | int nocache; | 171 | int nocache; |
171 | int noplainemail; | 172 | int noplainemail; |
172 | int noheader; | 173 | int noheader; |
173 | int renamelimit; | 174 | int renamelimit; |
174 | int snapshots; | 175 | int snapshots; |
175 | int summary_branches; | 176 | int summary_branches; |
176 | int summary_log; | 177 | int summary_log; |
177 | int summary_tags; | 178 | int summary_tags; |
179 | struct string_list mimetypes; | ||
178 | }; | 180 | }; |
179 | 181 | ||
180 | struct cgit_page { | 182 | struct cgit_page { |
181 | time_t modified; | 183 | time_t modified; |
182 | time_t expires; | 184 | time_t expires; |
183 | size_t size; | 185 | size_t size; |
184 | char *mimetype; | 186 | char *mimetype; |
185 | char *charset; | 187 | char *charset; |