Merge branch 'master' into developer

Conflicts: source/firm.c source/patches.c source/patches.h
2016-09-10 21:35:23 +02:00
parent 72c8212a0e 0f83d1ffaa
commit e6645554f0
5 changed files with 20 additions and 13 deletions
--- a/patches/svcGetCFWInfo.s
+++ b/patches/svcGetCFWInfo.s
@@ -34,6 +34,8 @@
        cmp r0, r2
        blo loop

+    mov r0, #0
+
    bx lr

 .pool