Changeset e8c8d00 for conf.h

Timestamp:

2010-03-17T15:15:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (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

@@ -53 +53 @@
         int ft_max_kbps;
         char *ft_listen;
+        char **protocols;
 } conf_t;