From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 4 Aug 2010 01:10:29 +0000 (+0200)
Subject: Merge branch 'jd/gitolite'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/aec9c245e7eaf444c7ae1851e3eda3b30748950f?hp=-c

Merge branch 'jd/gitolite'
---

aec9c245e7eaf444c7ae1851e3eda3b30748950f
diff --combined cgit.h
index 32d9d2b,232099d..4090cd4
--- a/cgit.h
+++ b/cgit.h
@@@ -19,7 -19,6 +19,7 @@@
  #include <xdiff-interface.h>
  #include <xdiff/xdiff.h>
  #include <utf8.h>
 +#include <notes.h>
  
  
  /*
@@@ -167,6 -166,7 +167,7 @@@ struct cgit_config 
  	char *logo;
  	char *logo_link;
  	char *module_link;
+ 	char *project_list;
  	char *robots;
  	char *root_title;
  	char *root_desc;
@@@ -183,6 -183,7 +184,7 @@@
  	int cache_static_ttl;
  	int embedded;
  	int enable_filter_overrides;
+ 	int enable_gitweb_owner;
  	int enable_index_links;
  	int enable_log_filecount;
  	int enable_log_linecount;
@@@ -202,6 -203,7 +204,7 @@@
  	int noplainemail;
  	int noheader;
  	int renamelimit;
+ 	int remove_suffix;
  	int snapshots;
  	int summary_branches;
  	int summary_log;