3edfa581ab
I don't have to manually resolve conflicts on every import. Ironically, most of these files have no changes from the vendor version except the $FreeBSD$ line. |
||
|---|---|---|
| .. | ||
| amd | ||
| bc | ||
| bind | ||
| binutils | ||
| bzip2 | ||
| com_err | ||
| cpio | ||
| cvs | ||
| diff | ||
| file | ||
| gcc | ||
| gdb | ||
| gnu-sort | ||
| gperf | ||
| groff | ||
| ipfilter | ||
| isc-dhcp | ||
| less | ||
| libf2c | ||
| libobjc | ||
| libpcap | ||
| libreadline | ||
| libstdc++ | ||
| lukemftp | ||
| lukemftpd | ||
| ncurses | ||
| ntp | ||
| nvi | ||
| one-true-awk | ||
| openpam | ||
| opie | ||
| pam_modules/pam_passwdqc | ||
| patch | ||
| pnpinfo | ||
| sendmail | ||
| smbfs | ||
| sort | ||
| tar | ||
| tcp_wrappers | ||
| tcpdump | ||
| tcsh | ||
| telnet | ||
| texinfo | ||
| top | ||
| traceroute | ||