Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-03-29 14:00:04 +02:00
parent 740b7a252d 8b5c38392a
commit 7517200cc7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp
View file

@ -405,8 +405,8 @@ IBackupServiceInterfaceImplementation::~IBackupServiceInterfaceImplementation()
// backupInterfaceSingletonInstantiator // backupInterfaceSingletonInstantiator
// //
// This object provokes instantiation of our singleton at service startup // This object provokes instantiation of our singleton at service startup
// The instantiation of the signleton provokes registration in the singleton registry // The instantiation of the singleton provokes registration in the singleton registry
// menaing that the init() routine gets called properly in service init, etc. // meaning that the init() routine gets called properly in service init, etc.
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
class CBackupInterfaceSingletonInstantiator class CBackupInterfaceSingletonInstantiator

4
code/ryzom/tools/client/client_config_qt/main.cpp
View file

@ -41,10 +41,10 @@ NLMISC::CCmdArgs Args;
int main(sint32 argc, char **argv) int main(sint32 argc, char **argv)
{ {
NLMISC::CApplicationContext applicationContext;
QApplication app(argc, argv); QApplication app(argc, argv);
NLMISC::CApplicationContext applicationContext;
// parse command-line arguments // parse command-line arguments
Args.setDescription("Ryzom Configuration"); Args.setDescription("Ryzom Configuration");
Args.addArg("p", "profile", "id", "Use this profile to determine what directory to use by default"); Args.addArg("p", "profile", "id", "Use this profile to determine what directory to use by default");