Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
955b1e6463
155 changed files with 9951 additions and 627 deletions
|
|
@ -1288,7 +1288,7 @@
|
|||
DEBUGVAR CountDownPauseVideo2
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
;Machine NewPaymentOpenBrewingXMLEnable
|
||||
Machine NewPaymentOpenBrewingXMLEnable
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue