src-test2/contrib/sendmail/praliases/praliases.c, branch release/7.3.0_cvs FreeBSD source tree https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F7.3.0_cvs 2010-01-31T19:17:12Z MFC: Merge sendmail 8.14.4 2010-01-31T19:17:12Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2010-01-31T19:17:12Z urn:sha1:7e3ee9fae9af807eaafc760cdec2f9858c7c39a7 Approved by: re (kensmith) MFC: sendmail 8.14.2 2007-11-11T17:07:37Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2007-11-11T17:07:37Z urn:sha1:574b6bd440a62d2cc11fcc88e2210b951884be68 Approved by: re (kensmith) Follow the (good) trend of returning import files to vendor versions 2003-02-23T21:58:16Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2003-02-23T21:58:16Z urn:sha1:e0e1e2d0a318185d3c5a4c56fdf162904b348961 where possible for easier future imports. Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so 2002-08-28T18:12:33Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2002-08-28T18:12:33Z urn:sha1:3edfa581abc74b072a4e9d770af9b461f529655e 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. Resolve conflicts from sendmail 8.12.4 import 2002-06-11T21:16:51Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2002-06-11T21:16:51Z urn:sha1:88ad41d4f09b2777d3b1998558aba8c4787904d9 Resolve conflicts from import of post-8.12.3 bug fixes. 2002-04-20T20:34:16Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2002-04-20T20:34:16Z urn:sha1:7320a0ab16e44a4b444c367f27d1d0a7d00ee31e Resolve conflicts from sendmail 8.12.2 import 2002-02-17T21:58:34Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2002-02-17T21:58:34Z urn:sha1:12ed1c7c81a0777c53a89597f28b0ece402a6e0c Resolve conflicts from 8.11.4 import 2001-05-28T17:10:35Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2001-05-28T17:10:35Z urn:sha1:c0c4794d8403bee6c8659347a54fd9d51d1c04f9 Repair 8.11.3 merge conflicts 2001-02-28T00:22:47Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2001-02-28T00:22:47Z urn:sha1:b4662009523ec096fb4069a551374975ae205613 Repair 8.11.2 merge conflicts 2001-01-21T22:21:43Z Gregory Neil Shapiro gshapiro@FreeBSD.org 2001-01-21T22:21:43Z urn:sha1:c46d91b759c7a461806a7f6e6efccc404d2c21b8