History log of /freebsd-10-stable/gnu/usr.bin/rcs/merge/
Revision Date Author Comments
256281 10-Oct-2013 gjb

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation


256198 09-Oct-2013 gjb

Revert r256095, r256120 (partial), r256121:

r256095:
- Add gnu/usr.bin/rcs back to the base system.

r256120:
- Add WITHOUT_RCS back to src.conf.5.

r256121:
- Remove UPDATING entry regarding gnu/usr.bin/rcs removal.

Requested by: many
Approved by: re (marius)
Discussed with: core


50472 27-Aug-1999 peter

$Id$ -> $FreeBSD$


28619 23-Aug-1997 steve

Add missing *roff macros to correct display about -V option.

PR: docs/4162
Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp


22996 22-Feb-1997 peter

Revert $FreeBSD$ to $Id$


21673 14-Jan-1997 jkh

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.


11892 28-Oct-1995 peter

This commit was generated by cvs2svn to compensate for changes in r11891,
which included commits to RCS files with non-trunk default branches.


113 09-Jul-1993 conklin

Update makefiles:
centralize obj/noobj conditional in Makefile.inc
use DPADD
don't compile profiling library
install rcsfreeze correctly
After this commit, the freebsd and netbsd rcs distribution will be in sync.


101 06-Jul-1993 nate

Really cleaned up obj/noobj this time (same as I did with CVS)


46 25-Jun-1993 nate

Fixed cvs to work with/without object directories and added missing rcslean
directory to top level makefile.


10 18-Jun-1993 jkh

This commit was generated by cvs2svn to compensate for changes in r9,
which included commits to RCS files with non-trunk default branches.