elisha464 07c9fbee7f Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Conflicts:
	rpcs3/Emu/GS/GL/GLGSRender.cpp
	rpcs3/Emu/GS/GL/GLGSRender.h
	rpcs3/Emu/GS/RSXTexture.cpp
	rpcs3/Emu/GS/RSXThread.cpp
	rpcs3/Emu/GS/RSXThread.h
	rpcs3/Gui/RSXDebugger.cpp
	rpcs3/rpcs3.vcxproj.filters
2014-02-17 19:27:17 +02:00
2014-02-15 01:51:59 +01:00
2013-08-26 17:18:59 +03:00
2014-02-16 22:17:56 +01:00
2014-02-13 20:59:13 +04:00
2014-02-09 12:07:50 +01:00
2014-02-13 20:59:13 +04:00
2014-02-16 17:19:06 +02:00
2014-02-13 11:33:07 +01:00
2014-02-16 17:19:06 +02:00

rpcs3

PS3 emulator/debugger

The FAQ has some basic information.

For discussion about the emulator and PS3 emulation please visit the official forums.

If you want to contribute please take a took at the Coding Style and Roadmap pages.

To initialize the repository don't forget to execute git submodule update --init to pull the wxWidgets source.

Languages
C++ 91.9%
C 5.5%
Self 1.1%
GLSL 0.8%
CMake 0.3%
Other 0.3%