diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 18:17:27 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 18:17:27 -0500 |
| commit | 7f292ba84e6910ecd010bfaacfb6b18c3bad4aa3 (patch) | |
| tree | 87378eefac5ca471706a27e7826c372edebd13a4 | |
| parent | be503990d94ab2d919ce5dd8198504c70249b379 (diff) | |
| parent | 105050fbe5afaf7e5698960a0e519b0eb31af359 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
# Conflicts:
# sym_bss.txt
| -rw-r--r-- | sym_bss.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sym_bss.txt b/sym_bss.txt index 717a78c77..45005362c 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -496,7 +496,7 @@ gUnknown_030012FC: @ 30012FC gUnknown_03001300: @ 3001300 .space 0x770 - .include "src/agb_flash.o" + .include "src/agb_flash.o" .space 0x2 |