mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-19 16:07:40 +00:00
Code Issues Releases Wiki Activity

resolved conflicts introduced by merging zenorogue/hyperrogue#21

Browse Source
This commit is contained in:
Zeno Rogue
2018-06-12 23:28:06 +02:00
parent b614116129 2fde42ce3f
commit 44affc3e9d
19 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shmup.cpp
View File

@@ -305,7 +305,7 @@ void showShmupConfig() {
dialog::addItem(XLAT("help"), 'h');
dialog::addItem(XLAT("exit configuration"), 'v');
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
}