Merge branch 'master' into another

8e1cb865 · nanahira · 09fdf4e9 · 74737dbe · 8e1cb865 · 8e1cb865
Commit 8e1cb865 authored Apr 29, 2019 by nanahira
Expand all Show whitespace changes
Inline Side-by-side

Showing with 375 additions and 188 deletions

cards.cdb cards.cdb +0 -0

lflist.conf lflist.conf +373 -186

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ f01ebeb6
+++ b/ocgcore @ f01ebeb6
-Subproject commit eb18a5c60a33702204f31b10ae227897061314db
+Subproject commit f01ebeb6df7b0e690c99aa614e1fe8dec97002a2
--- a/script @ 92551d40
+++ b/script @ 92551d40
-Subproject commit b6e3390b4f173d0c42cdbfffb7a7f85238fe1090
+Subproject commit 92551d40a2848cf03c28bdf1590e4180d7a8579c