Merge branch 'master' into jgrpp

# Conflicts: # src/lang/korean.txt # src/settings.cpp
2021-04-12 00:22:13 +01:00
parent 8e92a6844f e5b960eaeb
commit 272e583478
78 changed files with 184 additions and 55 deletions
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -85,6 +85,12 @@ var      = _video_hw_accel
 def      = true
 cat      = SC_BASIC

+[SDTG_BOOL]
+name     = ""video_vsync""
+var      = _video_vsync
+def      = false
+cat      = SC_BASIC
+
 [SDTG_OMANY]
 name     = ""support8bpp""
 type     = SLE_UINT8