diff options
| author |  bunnei | 2014-04-10 20:10:18 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-10 20:10:18 -0400 |
| commit | 95f237a086ec4a9c95f673c96dde72e87eb616c2 (patch) | |
| tree | 02567879b41ecf28a59291f28b1ae138cc36a762 /src/common/emu_window.h | |
| parent | added initial modules for setting up SysCall HLE (diff) | |
| parent | removed scm_rev.h from version control (diff) | |
| download | yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.tar.gz yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.tar.xz yuzu-95f237a086ec4a9c95f673c96dde72e87eb616c2.zip | |
Merge branch 'master' into hle-interface
Diffstat (limited to 'src/common/emu_window.h')
| -rw-r--r-- | src/common/emu_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 731784756..e70b99ec1 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h | |||
| @@ -55,7 +55,7 @@ public: | |||
| 55 | m_client_area_height = val; | 55 | m_client_area_height = val; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | std::string GetWindowTitle() { | 58 | std::string GetWindowTitle() const { |
| 59 | return m_window_title; | 59 | return m_window_title; |
| 60 | } | 60 | } |
| 61 | 61 | ||