Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform

# Conflicts:
#	src/frontend/qt_sdl/CMakeLists.txt
#	src/frontend/qt_sdl/Platform.cpp
#	src/frontend/qt_sdl/main.cpp

1 files changed, 0 insertions, 2 deletions

diff --git a/msys-dist.sh b/msys-dist.sh
index f2e5941..01b2ade 100755
--- a/msys-dist.sh
+++ b/msys-dist.sh
@@ -10,5 +10,3 @@ mkdir -p dist
 for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); do
 	cp "${lib}" dist
 done
-
-cp melonDS.exe romlist.bin dist