diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
| commit | 43f23b8a78a0111c88d671942a012d8d4b28596c (patch) | |
| tree | 743beb78116eb7f6558e8a6c906873e584cbf8b2 /asm/rom6.s | |
| parent | 3a3772c74ff76a258ffa4b6515fa07d5c96a2979 (diff) | |
| parent | f209cbd7a0519b49fcf3f1b7a3fca27d6dcaacd8 (diff) | |
Merge branch 'master' into dump_pointers
Diffstat (limited to 'asm/rom6.s')
| -rw-r--r-- | asm/rom6.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index e3145fb8a..51ae2834f 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -447,5 +447,5 @@ _081357EE: bx r0 .pool thumb_func_end sub_81357BC - + .align 2, 0 @ Don't pad with nop. |