Changeset 3fbce97 for protocols/msn/msn.h

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (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:

Merge branch 'master' into parson

File:

• protocols/msn/msn.h (modified) (1 diff)

protocols/msn/msn.h

@@ -112 +112 @@
 
         int poll_timeout;
+        int write_timeout;
 
         b_event_handler callback;