Henrik Rydgard ce5afbc166 Merge branch 'master' of https://github.com/tmaul/ppsspp into tmaul-master ...

Conflicts:
	Core/HLE/scePower.cpp
	Core/MIPS/MIPSIntVFPU.cpp
	Core/MIPS/MIPSIntVFPU.h
	gentest.py
	test.py

2012-11-11 22:50:48 +01:00

..

Debugger

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

ELF

Fake netconf dialog, etc

2012-11-06 19:22:14 +01:00

FileSystems

FIx broken merge

2012-11-11 00:47:24 +00:00

HLE

Merge branch 'master' of https://github.com/tmaul/ppsspp into tmaul-master

2012-11-11 22:50:48 +01:00

HW

Another memstick ioctl, minor fixes

2012-11-09 10:01:54 +01:00

MIPS

Test fixes and cleanups

2012-11-11 22:38:19 +01:00

Util

Fix crash bug in blockallocator when tag strings were too long

2012-11-07 19:10:34 +01:00

CMakeLists.txt

sceImpose

2012-11-09 12:31:58 +01:00

Config.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Config.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Core.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Core.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Core.vcxproj

sceImpose

2012-11-09 12:31:58 +01:00

Core.vcxproj.filters

sceImpose

2012-11-09 12:31:58 +01:00

CoreParameter.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

CoreTiming.cpp

Halt GPU on invalid addresses, more accurate GetTicks in CoreTiming

2012-11-07 15:40:46 +01:00

CoreTiming.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

CPU.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

CPU.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Host.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Host.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

Loaders.cpp

Misc fixes (accept .prx, work on power callbacks, bugs)

2012-11-10 10:15:11 +01:00

Loaders.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

MemMap.cpp

Add vcmp ES condition code, uncached mirror of scratchpad

2012-11-06 16:01:41 +01:00

MemMap.h

Rewrite callback handling, part 1. All sorts of other fixes too.

2012-11-06 15:46:46 +01:00

MemMapFunctions.cpp

Add vcmp ES condition code, uncached mirror of scratchpad

2012-11-06 16:01:41 +01:00

PSPLoaders.cpp

Add some missing HLE functions, fix loading unencrypted EBOOT.BIN

2012-11-06 16:20:13 +01:00

PSPLoaders.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

PSPMixer.cpp

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

PSPMixer.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00

System.cpp

Add more proper "Null" GPU

2012-11-06 17:05:27 +01:00

System.h

Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK.

2012-11-04 23:24:00 +01:00