Merge with develop
This commit is contained in:
commit
7517200cc7
2 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue