Merge branch 'master' into server

dbc6dbc3 · nanahira · 29a5804f · 43684102 · dbc6dbc3 · dbc6dbc3
Commit dbc6dbc3 authored Oct 10, 2019 by nanahira
Expand all Show whitespace changes
Inline Side-by-side

Showing with 200 additions and 14 deletions

cards.cdb cards.cdb +0 -0

lflist.conf lflist.conf +198 -12

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 @ 3fec1b3a
+++ b/ocgcore @ 3fec1b3a
-Subproject commit e18df9cd2f2af54026d0a48a607d0db83b54310c
+Subproject commit 3fec1b3a039f4f73871edfe4a51eed686c83a451
--- a/script @ feb9ce79
+++ b/script @ feb9ce79
-Subproject commit d4fb42bcdfe5ba5a36529b60432b167290a4dc54
+Subproject commit feb9ce79cb5d52ae6ec047d467befec49329d601