Changeset 75554d0 for conf.h

Timestamp:

2010-03-17T13:56:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b788246

Parents:

e5e795d (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 in 1.2.5.

File:

• conf.h (modified) (1 diff)

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        char **protocols;
 } conf_t;