zeromus a7ae3c0cfc Merge branch 'discsys' ... Conflicts: BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXDynamic.cs libmupen64plus/mupen64plus-win32-deps		2015-07-11 14:01:44 -05:00
..
Gameboy/Palettes	Removed the & symbols from the Pallets and the Rockman & Forte.lua file. Replaced with and	2014-12-20 13:36:36 +00:00
Lua	Added Ninja Gaiden II collision viewer (LUA).	2015-06-29 19:13:47 -05:00
NES/Palettes	load 512-entry palettes, but dont do anything with them yet	2014-08-14 15:52:25 +00:00
Shaders	work on opengl display manager: optimized codepaths, user retroshader selection, support for importing a textureID from another core; add erase button to lua console;	2014-04-15 21:46:18 +00:00
dll	Merge branch 'discsys'	2015-07-11 14:01:44 -05:00
gamedb	add a PSX game database	2015-07-11 13:47:03 -05:00
7z.dll	move output folder up one level	2013-11-03 14:06:46 +00:00
defctrl.json	apple II - fix up default controls	2015-05-28 00:20:50 +00:00