Henrik Rydgård 36943db4ec Merge branch 'master' of github.com:hrydgard/ppsspp ...

Conflicts:
	Core/Config.h

2012-12-05 10:57:30 +07:00

..

Android.mk

Parse PARAM.SFO to get the disc ID, show in title bar on Windows

2012-11-30 22:32:51 +01:00

Application.mk

Add armeabi on android

2012-12-02 22:48:31 +01:00

EmuScreen.cpp

Fix rendering on MacOSX (shader compiler very fussy...). Minor prep for hw transform.

2012-12-05 10:55:06 +07:00

EmuScreen.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

GamepadEmu.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

GamepadEmu.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

MenuScreens.cpp

Merge branch 'master' of github.com:hrydgard/ppsspp

2012-12-05 10:57:30 +07:00

MenuScreens.h

windows gui option for buffered rendering. Misc fixes, prettier checkbox on android.

2012-11-20 11:35:48 +01:00

NativeApp.cpp

Fix rendering on MacOSX (shader compiler very fussy...). Minor prep for hw transform.

2012-12-05 10:55:06 +07:00

ui_atlas.cpp

windows gui option for buffered rendering. Misc fixes, prettier checkbox on android.

2012-11-20 11:35:48 +01:00

ui_atlas.h

windows gui option for buffered rendering. Misc fixes, prettier checkbox on android.

2012-11-20 11:35:48 +01:00

UIShader.cpp

Fixes to usage of gl state stuff

2012-11-25 17:21:23 +01:00

UIShader.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