From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Jun 2010 09:42:12 +0000 (+0200)
Subject: Merge branch 'ag/atom-fixes'
X-Git-Tag: v0.9~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2766deb67acb1eae2b36dc0f5811a9cabb6db20;p=cgit

Merge branch 'ag/atom-fixes'
---

c2766deb67acb1eae2b36dc0f5811a9cabb6db20
diff --cc cgit.h
index 9b1e3f8,7fafb58..8884f9e
--- a/cgit.h
+++ b/cgit.h
@@@ -182,9 -182,9 +183,10 @@@ struct cgit_config 
  	int enable_log_filecount;
  	int enable_log_linecount;
  	int enable_remote_branches;
 +	int enable_subject_links;
  	int enable_tree_linenumbers;
  	int local_time;
+ 	int max_atom_items;
  	int max_repo_count;
  	int max_commit_count;
  	int max_lock_attempts;