cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Matthew Dillon]

dillon      2003/07/23 23:35:39 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Bring RCNG in from 5.x and adjust config files and scripts accordingly.
  Bring in the 5.x mergemaster.
  Bring in the 5.x rcorder.
  Adjust Makefile's and mtree to deal with /etc/rc.d
  
  Submitted-by: ROBERT GARRETT <rg70 at xxxxxxxxxxxxx>
  Additional-work-by: dillon
  
  Revision  Changes    Path
  1.3       +67 -30    src/usr.sbin/mergemaster/mergemaster.sh