Changeset e8c8d00 for conf.h


Ignore:
Timestamp:
2010-03-17T15:15:19Z (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • conf.h

    r1c3008a re8c8d00  
    5353        int ft_max_kbps;
    5454        char *ft_listen;
     55        char **protocols;
    5556} conf_t;
    5657
Note: See TracChangeset for help on using the changeset viewer.