16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 09:19:18 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-12-03 23:43:02 +01:00
40 changed files with 987 additions and 571 deletions

View File

@@ -49,5 +49,5 @@ private:
debug_panel m_debugpanel { "Debug Data", false };
transcripts_panel m_transcriptspanel { "Transcripts", true }; // voice transcripts
bool m_paused { false };
bool m_pause_modal_opened { false };
};