Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
1cbf1720ca
1 changed files with 3 additions and 3 deletions
|
@ -107,6 +107,9 @@ void quitCrashReport ()
|
|||
contReset(CrashCounterSock);
|
||||
}
|
||||
|
||||
// make it global if other classes/functions want to access to it
|
||||
NLMISC::CCmdArgs Args;
|
||||
|
||||
//---------------------------------------------------
|
||||
// MAIN :
|
||||
// Entry for the Application.
|
||||
|
@ -143,9 +146,6 @@ INT_PTR CALLBACK MyDialogProc(
|
|||
HWND SlashScreen = NULL;
|
||||
HINSTANCE HInstance;
|
||||
|
||||
// make it global if other classes/functions want to access to it
|
||||
NLMISC::CCmdArgs Args;
|
||||
|
||||
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR cmdline, int /* nCmdShow */)
|
||||
#else
|
||||
int main(int argc, char **argv)
|
||||
|
|
Loading…
Reference in a new issue