Merge branch 'fh/mimetypes'

2012-03-18 21:01:28 +00:00
parent 181b6e789b d01c600c17
commit ae90a0b2d1
4 changed files with 65 additions and 1 deletions
--- a/cgit.c
+++ b/cgit.c
@ -241,6 +241,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.ssdiff = atoi(value);
 	else if (!strcmp(name, "agefile"))
 		ctx.cfg.agefile = xstrdup(value);
+	else if (!strcmp(name, "mimetype-file"))
+		ctx.cfg.mimetype_file = xstrdup(value);
 	else if (!strcmp(name, "renamelimit"))
 		ctx.cfg.renamelimit = atoi(value);
 	else if (!strcmp(name, "remove-suffix"))