about summary refs log tree commit diff stats
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli2012-03-18 21:01:28 +0000
committerLars Hjemli2012-03-18 21:01:28 +0000
commitae90a0b2d18d66e7b1cb98b2e34fd697f8b5311a (patch)
tree0a2dd27e9d527914019026a9860c93c879b35cd7 /cgit.c
parentMerge branch 'jp/defbranch' (diff)
parentui_plain: automatically lookup mimetype when mimetype-file is set (diff)
downloadcgit-ae90a0b2d18d66e7b1cb98b2e34fd697f8b5311a.tar.gz
cgit-ae90a0b2d18d66e7b1cb98b2e34fd697f8b5311a.zip
Merge branch 'fh/mimetypes'
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c index 6a75f27..b9b3a66 100644 --- a/cgit.c +++ b/cgit.c
@@ -241,6 +241,8 @@ void config_cb(const char *name, const char *value)
241 ctx.cfg.ssdiff = atoi(value); 241 ctx.cfg.ssdiff = atoi(value);
242 else if (!strcmp(name, "agefile")) 242 else if (!strcmp(name, "agefile"))
243 ctx.cfg.agefile = xstrdup(value); 243 ctx.cfg.agefile = xstrdup(value);
244 else if (!strcmp(name, "mimetype-file"))
245 ctx.cfg.mimetype_file = xstrdup(value);
244 else if (!strcmp(name, "renamelimit")) 246 else if (!strcmp(name, "renamelimit"))
245 ctx.cfg.renamelimit = atoi(value); 247 ctx.cfg.renamelimit = atoi(value);
246 else if (!strcmp(name, "remove-suffix")) 248 else if (!strcmp(name, "remove-suffix"))