Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d3ca6b6626
49 changed files with 17461 additions and 586 deletions
|
|
@ -113,7 +113,7 @@
|
|||
;Oreo
|
||||
Var OreoGuarantee = 0
|
||||
|
||||
Var CurrentMainVideo = 0
|
||||
Var CurrentMainVideo = 2
|
||||
</EventOpen>
|
||||
|
||||
<Text>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue