Merge pull request #389 from notaz/master
authorTwinaphex <libretro@gmail.com>
Mon, 24 Feb 2020 18:39:44 +0000 (19:39 +0100)
committerGitHub <noreply@github.com>
Mon, 24 Feb 2020 18:39:44 +0000 (19:39 +0100)
Merge upstream changes

1  2 
frontend/menu.c

diff --cc frontend/menu.c
Simple merge