diff options
| author | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
| commit | 9e6376bd95ba9309365b39b878ab2f499776437a (patch) | |
| tree | a354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/guiKeyChangeMenu.h | |
| parent | e385af7cc01d156164b85d10b00a7047a5372e66 (diff) | |
| parent | e60eb32050a44d344795e4a1515a56038bb97e02 (diff) | |
| download | minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2 minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/guiKeyChangeMenu.h')
| -rw-r--r-- | src/guiKeyChangeMenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h index 2b498676b..833514c1d 100644 --- a/src/guiKeyChangeMenu.h +++ b/src/guiKeyChangeMenu.h @@ -64,7 +64,7 @@ private: bool resetMenu(); - void add_key(int id, std::string setting_name, std::string button_name); + void add_key(int id, wchar_t* button_name, std::string setting_name); bool shift_down; |