Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform

# Conflicts:
#	src/frontend/qt_sdl/CMakeLists.txt
#	src/frontend/qt_sdl/Platform.cpp
#	src/frontend/qt_sdl/main.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/GPU2D.h b/src/GPU2D.h
index c4bd2f9..521adf0 100644
--- a/src/GPU2D.h
+++ b/src/GPU2D.h
@@ -31,7 +31,7 @@ public:
 
     void SetEnabled(bool enable) { Enabled = enable; }
     void SetFramebuffer(u32* buf);
-    void SetDisplaySettings(bool accel);
+    void SetRenderSettings(bool accel);
 
     u8 Read8(u32 addr);
     u16 Read16(u32 addr);