diff options
author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /include/libgncmultiboot.h | |
parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'include/libgncmultiboot.h')
-rw-r--r-- | include/libgncmultiboot.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libgncmultiboot.h b/include/libgncmultiboot.h index b4d1cd231..33c9f6bfa 100644 --- a/include/libgncmultiboot.h +++ b/include/libgncmultiboot.h @@ -3,8 +3,8 @@ struct GcmbStruct { - u16 gcmb_field_0; - u8 gcmb_field_2; + u16 gcmb_field_0; + u8 gcmb_field_2; }; void GameCubeMultiBoot_Main(struct GcmbStruct *pStruct); |