Merge branch 'master' into developer

Conflicts:
	source/patches.c
This commit is contained in:
TuxSH 2016-08-18 00:39:21 +02:00
commit 0951260df7

View File

@ -24,9 +24,8 @@
#include "memory.h"
#include "config.h"
#include "../build/rebootpatch.h"
#include "../build/k11modulespatch.h"
#include "../build/svcGetCFWInfopatch.h"
#include "fs.h"
#include "../build/k11modulespatch.h"
static u32 *arm11ExceptionsPage = NULL;
static u32 *arm11SvcTable = NULL;