merge

3055da09 · nanahira · 0f5ef730 · f225c217 · 1b92dc06 · 3055da09
Commit 3055da09 authored Aug 22, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ocgcore ocgcore +1 -1

strings.conf strings.conf +1 -1

No files found.
--- a/ocgcore @ 1b92dc06
+++ b/ocgcore @ 1b92dc06
-Subproject commit 1b8b3c99eff96d05ef3d5be6daadbb2dfd5a8d42
+Subproject commit 1b92dc064e774fb9a81024d246ce4844df37301f
--- a/strings.conf
+++ b/strings.conf
@@ -925,4 +925,4 @@
 !setname 0x11f 奈芙提斯	ネフティス
 !setname 0x120 调皮宝贝	プランキッズ
 !setname 0x121 魔妖
-!setname 0x122 女武神
+!setname 0x122 女武神	Valkyrie