From dba1ff2ec464fb7f448c94cc4c8bf9d1e9b70d87 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 29 Mar 2016 14:00:04 +0200 Subject: [PATCH] Merge with develop --- .../src/game_share/_backup_service_interface_singleton.cpp | 4 ++-- code/ryzom/tools/client/client_config_qt/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp index 51dfa8c38..6191438ba 100644 --- a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp +++ b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp @@ -405,8 +405,8 @@ IBackupServiceInterfaceImplementation::~IBackupServiceInterfaceImplementation() // backupInterfaceSingletonInstantiator // // This object provokes instantiation of our singleton at service startup -// The instantiation of the signleton provokes registration in the singleton registry -// menaing that the init() routine gets called properly in service init, etc. +// The instantiation of the singleton provokes registration in the singleton registry +// meaning that the init() routine gets called properly in service init, etc. //------------------------------------------------------------------------------------------------- class CBackupInterfaceSingletonInstantiator diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/main.cpp index b99cde6c1..d5f104306 100644 --- a/code/ryzom/tools/client/client_config_qt/main.cpp +++ b/code/ryzom/tools/client/client_config_qt/main.cpp @@ -41,10 +41,10 @@ NLMISC::CCmdArgs Args; int main(sint32 argc, char **argv) { - NLMISC::CApplicationContext applicationContext; - QApplication app(argc, argv); + NLMISC::CApplicationContext applicationContext; + // parse command-line arguments Args.setDescription("Ryzom Configuration"); Args.addArg("p", "profile", "id", "Use this profile to determine what directory to use by default");