darkf 8ba9ac0f74 Fix merge conflicts

2014-12-29 19:47:41 -08:00

..

arm

Fix merge conflicts

2014-12-29 19:47:41 -08:00

file_sys

FileSys: Clean up according to the coding style, and remove redundant namespaced names.

2014-12-24 01:49:48 +00:00

hle

Kernel: New handle manager

2014-12-28 11:52:55 -02:00

hw

GPU: Implement frameskip and remove forced framebuffer swap hack.

2014-12-28 22:14:05 -05:00

loader

Merge pull request #291 from purpasmart96/license

2014-12-21 16:05:44 -05:00

CMakeLists.txt

More services & small clean ups

2014-12-25 19:08:33 -08:00

core_timing.cpp

License change

2014-12-20 21:20:24 -08:00

core_timing.h

License change

2014-12-20 21:20:24 -08:00

core.cpp

License change

2014-12-20 21:20:24 -08:00

core.h

License change

2014-12-20 21:20:24 -08:00

mem_map_funcs.cpp

Merge pull request #253 from purpasmart96/mem_map

2014-12-29 21:57:04 -05:00

mem_map.cpp

License change

2014-12-20 21:20:24 -08:00

mem_map.h

Merge pull request #253 from purpasmart96/mem_map

2014-12-29 21:57:04 -05:00

settings.cpp

License change

2014-12-20 21:20:24 -08:00

settings.h

GPU: Implement frameskip and remove forced framebuffer swap hack.

2014-12-28 22:14:05 -05:00

system.cpp

License change

2014-12-20 21:20:24 -08:00

system.h

License change

2014-12-20 21:20:24 -08:00