Merge branch 'master' into mono-portable
Conflicts:
.gitignore
BizHawk.Client.ApiHawk/BizHawk.Client.ApiHawk.csproj
BizHawk.Client.Common/BizHawk.Client.Common.csproj
BizHawk.Client.Common/lua/LuaSandbox.cs
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
BizHawk.Client.Common/tools/Cheat.cs
BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs
BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
BizHawk.Client.EmuHawk/tools/GameShark.cs
BizHawk.Emulation.Common/Interfaces/IInputPollable.cs
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.c
s
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
Dist/changelog.txt
output/Lua/Genesis/Earthworm Jim 2.lua
output/Lua/SNES/Super Mario World.lua
output/dll/mgba.dll
quicknes/bizinterface.cpp
quicknes/mingw/Makefile
c93697baee