Merge branch 'master' into developer
Conflicts: source/patches.c
This commit is contained in:
commit
0951260df7
@ -24,9 +24,8 @@
|
|||||||
#include "memory.h"
|
#include "memory.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "../build/rebootpatch.h"
|
#include "../build/rebootpatch.h"
|
||||||
#include "../build/k11modulespatch.h"
|
|
||||||
#include "../build/svcGetCFWInfopatch.h"
|
#include "../build/svcGetCFWInfopatch.h"
|
||||||
#include "fs.h"
|
#include "../build/k11modulespatch.h"
|
||||||
|
|
||||||
static u32 *arm11ExceptionsPage = NULL;
|
static u32 *arm11ExceptionsPage = NULL;
|
||||||
static u32 *arm11SvcTable = NULL;
|
static u32 *arm11SvcTable = NULL;
|
||||||
|
Reference in New Issue
Block a user