Mercurial > hg > Members > kono > nitros9-code

annotate level1/sys/merge.hp @ 3141:717ced83b885

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coco3: Build SD card device descriptors for CoCo3FPGA Added "CC3FPGAFLAGS = $(AFLAGS) -DCC3FPGA=1 $(FLAGS)" to "level2/coco3/modules/makefile" for flagging Coco3FPGA specific features in modules sources. Added "llcoco3fpga", "ddsd0_coco3fpga", "sd0_coco3fpga", and "sd1_coco3fpga" to the "coco3/modules/makefile" - RBF section, which also now adds all to the "NITROS9/MODULES/RBF" on all disk images for building new Coco3FPGA disks from NitrOS9. Added new descriptor section to the "level2/coco3/modules/makefile" reflecting the new Coco3FPGA SD card descriptors and their flags.
author Bill Pierce <merlinious999@gmail.com>
date Sat, 04 Feb 2017 11:06:28 +0100
parents 76b1793dbd1c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
285
5ac4920aa1f7 Added *.hp files from OS-9 Level Two, removed cmds.hp as the old OS-9 Level One
boisy
parents:
diff changeset
1 @MERGE
905
1f6c644006f1 Major overhaul, attempting documentation consistency
boisy
parents: 285
diff changeset
2 Syntax: Merge <path> [<path> [...]]
285
5ac4920aa1f7 Added *.hp files from OS-9 Level Two, removed cmds.hp as the old OS-9 Level One
boisy
parents:
diff changeset
3 Usage : Copies multiple input files to standard output
1329
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
4 Opts :
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
5 -z = get list of files from standard input
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
6