Fix conflict

This commit is contained in:
Sebastian-byte
2021-07-25 18:34:28 -05:00
parent 9069e9c9d0
commit 65d3068e9f
1150 changed files with 6065 additions and 1550 deletions

8
launcher/MMCStrings.h Normal file
View File

@@ -0,0 +1,8 @@
#pragma once
#include <QString>
namespace Strings
{
int naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs);
}