s/virtualbox-ose-additions(-legacy): fix conflicts

	Commit message (Expand)	Author	Age	Files	Lines
Guido Falsi	2021-05-22	1	-0/+1
*	emulators/virtualbox-ose: Update to 6.1.22	Guido Falsi	2021-05-01	2	-4/+4
*	emulators/virtualbox-ose: Update to 6.1.20	Guido Falsi	2021-04-23	2	-7/+6
*	emulators/virtualbox-ose-additions: Fix vboxvfs panic	Guido Falsi	2021-04-22	1	-0/+1
*	all: Remove all other $FreeBSD keywords.	Mathieu Arnold	2021-04-06	2	-5/+0
*	Remove # $FreeBSD$ from Makefiles.	Mathieu Arnold	2021-04-06	1	-1/+0
*	emulators/virtualbox-ose-additions: Fix MASTER_SITES	Li-Wen Hsu	2021-03-10	1	-1/+1
*	- Update VirtualBox OSE to 6.1.18	Guido Falsi	2021-03-10	2	-16/+6
*	Unbreak after r559828	Antoine Brodin	2021-01-16	1	-0/+1
*	emulators/virtualbox-ose-additions: drop optional support for OPENGL	Rene Ladan	2021-01-01	2	-24/+1
*	Fix patch to virtualbox-ose-additions OpenGL ssupport to actually	Guido Falsi	2020-10-27	1	-5/+1
*	Apply fix to emulators/virtualbox-ose-additions to allow building	Guido Falsi	2020-10-24	1	-0/+4
*	Do not allow compiling C++ files for drivers with built-in functions.	Jung-uk Kim	2020-08-15