Henrik Rydgard c499be9769 Merge branch 'adhoc-support' of https://github.com/Kyhel/ppsspp into Kyhel-adhoc-support
hrydgard here: I switched to our implementation of thread.h and removed the "Windows7SDK" things for now.

Conflicts:
	Core/Core.vcxproj.filters
2013-11-27 21:21:32 +01:00
..