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

start rebasing

This commit is contained in:
radius 2017-03-19 15:10:08 -05:00
parent 95e2188914
commit 4c0ef6782f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NDS.cpp
View File

@ -323,8 +323,6 @@ void Reset()
_soundbias = 0; _soundbias = 0;
} }
<<<<<<< HEAD:src/NDS.cpp
void LoadROM(const char* path, bool direct) void LoadROM(const char* path, bool direct)
{ {
Reset(); Reset();