unfuck the merge
This commit is contained in:
parent
e63c2985fc
commit
2f1664a5ae
|
@ -33,7 +33,8 @@ set(SOURCES_QT_SDL
|
||||||
font.h
|
font.h
|
||||||
Platform.cpp
|
Platform.cpp
|
||||||
QPathInput.h
|
QPathInput.h
|
||||||
|
ROMManager.cpp
|
||||||
|
SaveManager.cpp
|
||||||
CameraManager.cpp
|
CameraManager.cpp
|
||||||
|
|
||||||
ArchiveUtil.h
|
ArchiveUtil.h
|
||||||
|
|
Loading…
Reference in New Issue