Merge branch 'master' into raw-video

0b85e9fc · nanahira · 07f02671 · 41ec6441 · 0b85e9fc · 29f43b23
Commit 0b85e9fc authored Jun 27, 2023 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 426 additions and 36 deletions

lflist.conf lflist.conf +423 -33

ocgcore ocgcore +1 -1

script script +1 -1

system.conf system.conf +1 -1

No files found.
--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ 29f43b23
+++ b/ocgcore @ 29f43b23
-Subproject commit 0df2566f9356e7b79392bf72edbf1a75fa3a1ac1
+Subproject commit 29f43b232c1ca9d661bd4e373db4ce543ea3768e
--- a/script @ 66532d87
+++ b/script @ 66532d87
-Subproject commit d5747ceb983d601d117a838139fe13b0ec502057
+Subproject commit 66532d87f88cb95256f74ecad9d41485ee16ea88
--- a/system.conf
+++ b/system.conf
@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4948
+pro_version = 4960
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi