ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

This commit is contained in:
Vicki Pfau 2020-06-17 22:15:36 -07:00
parent c082610992
commit 2279521482
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mgba/internal/ds/memory.h
View File

@ -18,7 +18,7 @@ CXX_GUARD_START
#include <mgba/internal/ds/slot1.h> #include <mgba/internal/ds/slot1.h>
#include <mgba/internal/ds/spi.h> #include <mgba/internal/ds/spi.h>
const uint32_t redzoneInstruction; extern const uint32_t redzoneInstruction;
enum DSMemoryRegion { enum DSMemoryRegion {
DS7_REGION_BIOS = 0x0, DS7_REGION_BIOS = 0x0,

1
src/gb/input.c
View File

@ -1,5 +1,4 @@
/* Copyright (c) 2013-2019 Jeffrey Pfau /* Copyright (c) 2013-2019 Jeffrey Pfau
>>>>>>> master
* *
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this