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
@@ -145,8 +145,9 @@ struct cgit_query { | |||
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; |
@@ -184,8 +185,9 @@ struct cgit_config { | |||
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; |