Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-25 19:26:05 +03:00
parent 932cd9e262 38d77b58cd
commit a5938a7de9
40 changed files with 117 additions and 54 deletions
--- a/launcher/ui/dialogs/ExportInstanceDialog.h
+++ b/launcher/ui/dialogs/ExportInstanceDialog.h
@@ -43,7 +43,7 @@
 #include "FileIgnoreProxy.h"

 class BaseInstance;
-typedef std::shared_ptr<BaseInstance> InstancePtr;
+using InstancePtr = std::shared_ptr<BaseInstance>;

 namespace Ui {
 class ExportInstanceDialog;