Reformat all the things. Have fun with merge conflicts.

Source/Core/VideoCommon/OnScreenDisplay.h

@@ -13,15 +13,15 @@ namespace OSD
 {
 // On-screen message display (colored yellow by default)
 void AddMessage(const std::string& str, u32 ms = 2000, u32 rgba = 0xFFFFFF30);
-void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
+void DrawMessages();  // draw the current messages on the screen. Only call once per frame.
 void ClearMessages();
 
 // On-screen callbacks
 enum class CallbackType
 {
-	Initialization,
-	OnFrame,
-	Shutdown
+  Initialization,
+  OnFrame,
+  Shutdown
 };
 using Callback = std::function<void()>;