resolved conflicts introduced by merging zenorogue/hyperrogue#21

This commit is contained in:
Zeno Rogue
2018-06-12 23:28:06 +02:00
19 changed files with 36 additions and 62 deletions
+1 -1
View File
@@ -277,7 +277,7 @@ namespace ss {
}
dialog::addBreak(50);
if(size(slideshows) > 1) dialog::addItem(XLAT("change slideshow"), '1');
dialog::addItem(XLAT("exit menu"), '0');
dialog::addItem(XLAT("go back"), ' ');
dialog::display();
keyhandler = [] (int sym, int uni) {
if(uni >= 'a' && uni < 'a' + sssize) {