From 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 10:29:22 +0000
Subject: Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c
---
(limited to 'cgit.h')

diff --git a/cgit.h b/cgit.h
index 78b30ba..8c64efe 100644
--- a/cgit.h
+++ b/cgit.h
@@ -156,6 +156,7 @@ struct cgit_config {
 	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;
@@ -167,6 +168,7 @@ struct cgit_config {
 	int max_repodesc_len;
 	int max_stats;
 	int nocache;
+	int noheader;
 	int renamelimit;
 	int snapshots;
 	int summary_branches;
--
cgit v0.9.0.2