Merge branch 'master' into developer

Conflicts: source/firm.c source/firm.h source/patches.c source/patches.h
2016-08-29 20:12:23 +02:00
parent 84f3eddaf8 06fe06f9f1
commit cb9576b10e
26 changed files with 433 additions and 411 deletions
--- a/patches/emunand.s
+++ b/patches/emunand.s
@@ -43,4 +43,4 @@ nand_sd:
 sdmmc:	                .ascii "SDMC"
 nand_offset:		.ascii "NAND"       ; for rednand this should be 1
 ncsd_header_offset:	.ascii "NCSD"       ; depends on nand manufacturer + emunand type (GW/RED)
-.close
+.close
--- a/patches/reboot.s
+++ b/patches/reboot.s
@@ -125,4 +125,4 @@ dat_fname: .dcw "sdmc:/Luma3DS.dat"
    bx r0

 .pool
-.close
+.close
--- a/patches/twl_k11modules.s
+++ b/patches/twl_k11modules.s
@@ -143,4 +143,4 @@ patchesEnd:

 .pool

-.close
+.close