adelikat 4ae0b2cd22 Merge branch 'master' into waterbox2 ... Conflicts: BizHawk.Client.EmuHawk/MainForm.Events.cs BizHawk.Client.EmuHawk/MainForm.cs		2017-06-04 18:18:11 -05:00
..
Gameboy/Palettes	move assorting junk from the Output directory to Assets; add build step to copy them from Assets to the appropriate 32/64 output directory	2016-02-28 21:59:17 -06:00
Lua	Gargoyles.lua: fix last frame comparisons	2017-01-19 14:50:15 +03:00
NES/Palettes	move assorting junk from the Output directory to Assets; add build step to copy them from Assets to the appropriate 32/64 output directory	2016-02-28 21:59:17 -06:00
Shaders/BizHawk	move assorting junk from the Output directory to Assets; add build step to copy them from Assets to the appropriate 32/64 output directory	2016-02-28 21:59:17 -06:00
Tools	move assorting junk from the Output directory to Assets; add build step to copy them from Assets to the appropriate 32/64 output directory	2016-02-28 21:59:17 -06:00
dll	ok, it's over. exe packing is for the birds	2016-03-24 19:10:08 -05:00
gamedb	Update gamedb_nes.txt	2017-06-04 17:25:09 -04:00
defctrl.json	NGP - default controls	2017-05-31 17:51:43 -05:00