diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-10 20:10:18 -0400 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-10 20:10:18 -0400 |
commit | 95f237a086ec4a9c95f673c96dde72e87eb616c2 (patch) | |
tree | 02567879b41ecf28a59291f28b1ae138cc36a762 /src/common/emu_window.h | |
parent | f68de21ad1cd267029b60ee3767d219c46f5fba0 (diff) | |
parent | 17b32b7b3fa54ab2c5754db79df560052758236d (diff) |
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: m_client_area_height = val; } - std::string GetWindowTitle() { + std::string GetWindowTitle() const { return m_window_title; } |