author | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
commit | 29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch) (unidiff) | |
tree | 5a9a7b0b976b442cc8dda6195b804993c603d28d /cgit.h | |
parent | 833b0d2732f808281496df16eb917d6fdb0a274f (diff) | |
parent | 42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff) | |
download | cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.zip cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.bz2 |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit:
allow specification of directly linked blobs mimetypes
allow blob extract blobs by head/path combination
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -107,24 +107,25 @@ struct cgit_query { | |||
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | char *mimetype; | ||
119 | int ofs; | 120 | int ofs; |
120 | }; | 121 | }; |
121 | 122 | ||
122 | struct cgit_config { | 123 | struct cgit_config { |
123 | char *agefile; | 124 | char *agefile; |
124 | char *cache_root; | 125 | char *cache_root; |
125 | char *clone_prefix; | 126 | char *clone_prefix; |
126 | char *css; | 127 | char *css; |
127 | char *index_header; | 128 | char *index_header; |
128 | char *index_info; | 129 | char *index_info; |
129 | char *logo; | 130 | char *logo; |
130 | char *logo_link; | 131 | char *logo_link; |