BizHawk/libgambatte
Sappharad 2e4720cae9 Merged branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.Common/BizHawk.Client.Common.csproj
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Common/InstanceDll.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	vbanext/instance.cpp
2016-05-03 21:51:47 -05:00
..
include Merge branch 'master' into mono-portable 2016-02-15 18:38:48 -06:00
src Merged branch 'master' into mono-portable 2016-05-03 21:51:47 -05:00
xcode/gambatte.xcodeproj - Shock the octopus and bat the goomba. 2015-10-15 21:49:20 -05:00
Makefile gambatte: some stuff for 64 bit builds, both msvc and mingw 2016-02-29 22:02:47 -05:00
libgambatte.sln gambatte: some stuff for 64 bit builds, both msvc and mingw 2016-02-29 22:02:47 -05:00
libgambatte.vcxproj gambatte: some stuff for 64 bit builds, both msvc and mingw 2016-02-29 22:02:47 -05:00
libgambatte.vcxproj.filters GB: cleanup and stuff 2014-06-16 15:59:39 +00:00