Merge pull request #369 from negativeExponent/switch

author Twinaphex <libretro@gmail.com>

Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)

committer GitHub <noreply@github.com>

Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)
author Twinaphex <libretro@gmail.com>
Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)
committer GitHub <noreply@github.com>
Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)
diff --cc frontend/libretro.c
Simple merge
diff --cc frontend/libretro_core_options.h
Simple merge
author	Twinaphex <libretro@gmail.com>
	Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)
committer	GitHub <noreply@github.com>
	Mon, 16 Dec 2019 17:50:50 +0000 (18:50 +0100)
		1	2
frontend/libretro.c	patch \|	diff1 \|	diff2 \|	blob \| history
frontend/libretro_core_options.h	patch \|	diff1 \|	diff2 \|	blob \| history