Merging mainline.

1 files changed, 1 insertions, 0 deletions

diff --git a/conf.h b/conf.h
index b39845ad..f4976039 100644
--- a/conf.h
+++ b/conf.h
@@ -52,6 +52,7 @@ typedef struct conf
 	size_t ft_max_size;
 	int ft_max_kbps;
 	char *ft_listen;
+	char **protocols;
 } conf_t;
 
 G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );