NetBSD master CVS tree commits

[The Source of All Evil <source%NetBSD.ORG@localhost>]

veego
Sun Jul 12 08:01:49 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory nb00:/tmp/cvs-serv20522

Modified Files:
        fils.c 
Log Message:
Resolve conflict from the import.


veego
Sun Jul 12 08:02:45 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory nb00:/tmp/cvs-serv20549

Modified Files:
        ipnat.c 
Log Message:
Resolve conflict from the import.


veego
Sun Jul 12 08:05:25 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory nb00:/tmp/cvs-serv20587

Modified Files:
        ipnat.5 
Log Message:
Resolve conflict from the import.


veego
Sun Jul 12 08:06:37 PDT 1998
Update of /cvsroot/src/usr.sbin/ipf/rules
In directory nb00:/tmp/cvs-serv20645

Modified Files:
        mkfilters.1 
Log Message:
Resolve conflict from the import.