Merge branch 'master' into server

0b2f164a · nanahira · 7eaf5e96 · 210e5722 · 9caab1f4 · 0b2f164a
Commit 0b2f164a authored May 31, 2023 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ocgcore ocgcore +1 -1

system.conf system.conf +1 -1

No files found.
--- a/ocgcore @ 9caab1f4
+++ b/ocgcore @ 9caab1f4
-Subproject commit 0df2566f9356e7b79392bf72edbf1a75fa3a1ac1
+Subproject commit 9caab1f41797fecb01e6b05b48b061dfe29c86be
--- 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