Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c

1 files changed, 2 insertions, 0 deletions

diff --git a/cgit.h b/cgit.h
index 78b30ba..8c64efe 100644
--- a/cgit.h
+++ b/cgit.h
@@ -158,2 +158,3 @@ struct cgit_config {
         int cache_static_ttl;
+        int embedded;
         int enable_index_links;
@@ -169,2 +170,3 @@ struct cgit_config {
         int nocache;
+        int noheader;
         int renamelimit;