Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -114,7 +114,7 @@ public:
 	}

 	/*
-	 * Return a pointer to the currently active display mode, or NULL if
+	 * Return a pointer to the currently active display mode, or nullptr if
 	 * display is inactive
 	 *
 	 * Note that inactive *does not* necessarily mean unusable. E.g., in X11,