summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2014-11-17 12:05:32 -0500
committerGravatar bunnei2014-11-17 12:05:32 -0500
commitd563bcdaec1fad038a9b652d3519b663742d3104 (patch)
tree0d997841a594941647956efa2155d76ac9c07720
parentMerge pull request #195 from lioncash/control (diff)
parentemu_window: Fix initializer list order. (diff)
downloadyuzu-d563bcdaec1fad038a9b652d3519b663742d3104.tar.gz
yuzu-d563bcdaec1fad038a9b652d3519b663742d3104.tar.xz
yuzu-d563bcdaec1fad038a9b652d3519b663742d3104.zip
Merge pull request #202 from lioncash/init-order
emu_window: Fix initializer list order.
Diffstat (limited to '')
-rw-r--r--src/common/emu_window.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 4d09acb8b..6c2b598f6 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -76,9 +76,9 @@ public:
76 76
77protected: 77protected:
78 EmuWindow(): 78 EmuWindow():
79 m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc)),
79 m_client_area_width(640), 80 m_client_area_width(640),
80 m_client_area_height(480), 81 m_client_area_height(480)
81 m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc))
82 {} 82 {}
83 virtual ~EmuWindow() {} 83 virtual ~EmuWindow() {}
84 84