Changeset c821e8a for conf.h


Ignore:
Timestamp:
2008-06-02T12:58:57Z (11 years ago)
Author:
ulim <a.sporto+bee@…>
Branches:
master
Children:
3355a82
Parents:
cce0450 (diff), de8e584 (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:

merged in upstream r384. No conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • conf.h

    rcce0450 rc821e8a  
    3232typedef struct conf
    3333{
    34         char *iface;
     34        char *iface_in, *iface_out;
    3535        char *port;
    3636        int nofork;
Note: See TracChangeset for help on using the changeset viewer.