Merge branch 'master' into libretro

diff --cc .gitmodules
index b9afb32,e96248d..0000000
deleted file mode 100644,100644
--- 1/.gitmodules
--- 2/.gitmodules
+++ /dev/null
@@@ -1,3 -1,21 +1,0 @@@
- [submodule "frontend/libpicofe"]
 -[submodule "libpicofe"]
--      path = frontend/libpicofe
--      url = https://github.com/notaz/libpicofe.git
 -[submodule "warm"]
 -      path = frontend/warm
 -      url = https://github.com/notaz/warm.git
 -[submodule "libchdr"]
 -      path = deps/libchdr
 -      url = https://github.com/rtissera/libchdr.git
 -[submodule "deps/lightrec"]
 -      path = deps/lightrec
 -      url = https://github.com/pcercuei/lightrec.git
 -[submodule "deps/lightning"]
 -      path = deps/lightning
 -      url = https://github.com/pcercuei/gnu_lightning.git
 -[submodule "deps/libretro-common"]
 -      path = deps/libretro-common
 -      url = https://github.com/libretro/libretro-common.git
 -[submodule "deps/mman"]
 -      path = deps/mman
 -      url = https://github.com/witwall/mman-win32