Changeset c821e8a for conf.h

Timestamp:

2008-06-02T12:58:57Z (16 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:

• conf.h (modified) (1 diff)

conf.h

@@ -32 +32 @@
 typedef struct conf
 {
-        char *iface;
+        char *iface_in, *iface_out;
         char *port;
         int nofork;