Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 21e7262 e5c8ff7)

commit	00514c158151b391400c7c580954e70bf7727704
author	Toomas Soome <tsoome@me.com>
	Thu, 26 Jul 2018 22:41:35 +0000 (27 01:41 +0300)
committer	Toomas Soome <tsoome@me.com>
	Thu, 26 Jul 2018 22:41:35 +0000 (27 01:41 +0300)
tree	03db207c8efc64807702a21be86967d17db7d56f	tree \| snapshot (tar.gz zip)
parent	21e7262d54b0cf57fd0243d323cc986d714ce804	commit \| diff
parent	e5c8ff75a75d432be90967cc1392a114699f801f	commit \| diff

Merge branch 'merges' of git://repo.or.cz/unleashed into merges

17 files changed:

arch/x86/kernel/platform/i86pc/dboot/dboot_startkern.c	diff1 \|	diff2 \|	blob \| history
kernel/fs/zfs/zfs_ioctl.c	diff1 \|	diff2 \|	blob \| history
share/man/man5/pxeboot.5	diff1 \|	diff2 \|	blob \| history
share/man/man5/zpool-features.5	diff1 \|	diff2 \|	blob \| history
usr/src/Makefile.master	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/boot/sys/boot/libstand/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/lib/libdiskmgt/common/disks_private.h	diff1 \|	diff2 \|	blob \| history
usr/src/lib/libdiskmgt/common/slice.c	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/SUNWcs.man1.inc	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/developer-build-onbld.mf	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/system-core-os.mf	diff1 \|	diff2 \|	blob \| history
usr/src/tools/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/tools/scripts/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/Makefile.files	diff1 \|	diff2 \|	blob \| history
usr/src/uts/intel/Makefile.intel	diff1 \|	diff2 \|	blob \| history

Unleashed OS