Changeset 164352e for conf.h

Timestamp:

2011-12-24T18:02:39Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• conf.h (modified) (1 diff)

conf.h

@@ -54 +54 @@
         char *ft_listen;
         char **protocols;
+        char *cafile;
 } conf_t;