author | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
commit | 7710178e45dee61e85ea77c4221309ce8c086f95 (patch) (unidiff) | |
tree | 281c5251777308f18c05d323183b28470445f4bc /cgit.h | |
parent | e78186dcb63ec67a38dddfcd8f91d2108583320b (diff) | |
parent | b54ef9749c083afd86573112fad3b3ed8ee2d0e4 (diff) | |
download | cgit-7710178e45dee61e85ea77c4221309ce8c086f95.zip cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.gz cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.bz2 |
Merge branch 'lh/stats'
Conflicts:
cgit.c
cgit.css
cgit.h
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -60,8 +60,9 @@ struct cgit_repo { | |||
60 | char *clone_url; | 60 | char *clone_url; |
61 | int snapshots; | 61 | int snapshots; |
62 | int enable_log_filecount; | 62 | int enable_log_filecount; |
63 | int enable_log_linecount; | 63 | int enable_log_linecount; |
64 | int max_stats; | ||
64 | time_t mtime; | 65 | time_t mtime; |
65 | }; | 66 | }; |
66 | 67 | ||
67 | struct cgit_repolist { | 68 | struct cgit_repolist { |
@@ -119,8 +120,9 @@ struct cgit_query { | |||
119 | char *path; | 120 | char *path; |
120 | char *name; | 121 | char *name; |
121 | char *mimetype; | 122 | char *mimetype; |
122 | char *url; | 123 | char *url; |
124 | char *period; | ||
123 | int ofs; | 125 | int ofs; |
124 | int nohead; | 126 | int nohead; |
125 | char *sort; | 127 | char *sort; |
126 | int showmsg; | 128 | int showmsg; |
@@ -159,8 +161,9 @@ struct cgit_config { | |||
159 | int max_commit_count; | 161 | int max_commit_count; |
160 | int max_lock_attempts; | 162 | int max_lock_attempts; |
161 | int max_msg_len; | 163 | int max_msg_len; |
162 | int max_repodesc_len; | 164 | int max_repodesc_len; |
165 | int max_stats; | ||
163 | int nocache; | 166 | int nocache; |
164 | int renamelimit; | 167 | int renamelimit; |
165 | int snapshots; | 168 | int snapshots; |
166 | int summary_branches; | 169 | int summary_branches; |