author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) (side-by-side diff) | |
tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /cgit.h | |
parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -143,43 +143,45 @@ struct cgit_config { char *logo; char *logo_link; char *module_link; char *repo_group; char *robots; char *root_title; char *root_desc; char *root_readme; char *script_name; char *virtual_root; int cache_size; int cache_dynamic_ttl; int cache_max_create_time; int cache_repo_ttl; int cache_root_ttl; int cache_static_ttl; + int embedded; int enable_index_links; int enable_log_filecount; int enable_log_linecount; int local_time; int max_repo_count; int max_commit_count; int max_lock_attempts; int max_msg_len; int max_repodesc_len; int max_stats; int nocache; + int noheader; int renamelimit; int snapshots; int summary_branches; int summary_log; int summary_tags; }; struct cgit_page { time_t modified; time_t expires; size_t size; char *mimetype; char *charset; char *filename; char *etag; char *title; |