From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 9 Aug 2009 11:46:34 +0000 (+0200)
Subject: Merge branch 'lh/about'
X-Git-Tag: v0.8.3~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db8b8cb9467625cb8d9ecb67863aa67590e59cc0;p=cgit

Merge branch 'lh/about'

Conflicts:
	cgit.h
---

db8b8cb9467625cb8d9ecb67863aa67590e59cc0
diff --cc cgit.h
index b8557ac,b8f4850..4c854ea
--- a/cgit.h
+++ b/cgit.h
@@@ -187,7 -186,7 +188,8 @@@ struct cgit_config 
  	int summary_branches;
  	int summary_log;
  	int summary_tags;
 +	struct string_list mimetypes;
+ 	struct cgit_filter *about_filter;
  	struct cgit_filter *commit_filter;
  	struct cgit_filter *source_filter;
  };