Changeset 6738a67 for conf.h

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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 in latest trunk

File:

• conf.h (modified) (1 diff)

conf.h

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