Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+2 -2
View File
@@ -60,7 +60,7 @@ void ScreenSaveSync::Init()
ANSWER_YES,
SaveSyncChanges,
RevertSyncChanges,
NULL );
nullptr );
}
void ScreenSaveSync::PromptSaveSync( ScreenMessage sm )
@@ -72,7 +72,7 @@ void ScreenSaveSync::PromptSaveSync( ScreenMessage sm )
ANSWER_YES,
SaveSyncChanges,
RevertSyncChanges,
NULL );
nullptr );
}