author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
commit | c2766deb67acb1eae2b36dc0f5811a9cabb6db20 (patch) (unidiff) | |
tree | 463ea4a4388f2c449dec9eb49b33f9c0942030d1 /cgit.h | |
parent | caf0825d97582d137387b8879867247e92cca022 (diff) | |
parent | 80476b0d2873eb212fad38487fd6189bd6629cbe (diff) | |
download | cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.zip cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.gz cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.bz2 |
Merge branch 'ag/atom-fixes'
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -137,24 +137,25 @@ struct cgit_query { | |||
137 | char *sha1; | 137 | char *sha1; |
138 | char *sha2; | 138 | char *sha2; |
139 | char *path; | 139 | char *path; |
140 | char *name; | 140 | char *name; |
141 | char *mimetype; | 141 | char *mimetype; |
142 | char *url; | 142 | char *url; |
143 | char *period; | 143 | char *period; |
144 | int ofs; | 144 | int ofs; |
145 | int nohead; | 145 | int nohead; |
146 | char *sort; | 146 | char *sort; |
147 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | ||
149 | }; | 150 | }; |
150 | 151 | ||
151 | struct cgit_config { | 152 | struct cgit_config { |
152 | char *agefile; | 153 | char *agefile; |
153 | char *cache_root; | 154 | char *cache_root; |
154 | char *clone_prefix; | 155 | char *clone_prefix; |
155 | char *css; | 156 | char *css; |
156 | char *favicon; | 157 | char *favicon; |
157 | char *footer; | 158 | char *footer; |
158 | char *head_include; | 159 | char *head_include; |
159 | char *header; | 160 | char *header; |
160 | char *index_header; | 161 | char *index_header; |
@@ -176,24 +177,25 @@ struct cgit_config { | |||
176 | int cache_root_ttl; | 177 | int cache_root_ttl; |
177 | int cache_scanrc_ttl; | 178 | int cache_scanrc_ttl; |
178 | int cache_static_ttl; | 179 | int cache_static_ttl; |
179 | int embedded; | 180 | int embedded; |
180 | int enable_filter_overrides; | 181 | int enable_filter_overrides; |
181 | int enable_index_links; | 182 | int enable_index_links; |
182 | int enable_log_filecount; | 183 | int enable_log_filecount; |
183 | int enable_log_linecount; | 184 | int enable_log_linecount; |
184 | int enable_remote_branches; | 185 | int enable_remote_branches; |
185 | int enable_subject_links; | 186 | int enable_subject_links; |
186 | int enable_tree_linenumbers; | 187 | int enable_tree_linenumbers; |
187 | int local_time; | 188 | int local_time; |
189 | int max_atom_items; | ||
188 | int max_repo_count; | 190 | int max_repo_count; |
189 | int max_commit_count; | 191 | int max_commit_count; |
190 | int max_lock_attempts; | 192 | int max_lock_attempts; |
191 | int max_msg_len; | 193 | int max_msg_len; |
192 | int max_repodesc_len; | 194 | int max_repodesc_len; |
193 | int max_blob_size; | 195 | int max_blob_size; |
194 | int max_stats; | 196 | int max_stats; |
195 | int nocache; | 197 | int nocache; |
196 | int noplainemail; | 198 | int noplainemail; |
197 | int noheader; | 199 | int noheader; |
198 | int renamelimit; | 200 | int renamelimit; |
199 | int snapshots; | 201 | int snapshots; |