2 Commits

Author	SHA1	Message	Date
msincenselee	bdd35fb9d5	comment vnpy	2015-11-15 15:53:54 +08:00
msincenselee	676c4c6d40	Merge remote-tracking branch 'refs/remotes/vnpy/master' ... Conflicts: .gitignore vn.trader/CTP_connect.json vn.trader/ContractData.vt vn.trader/LTS_connect.json vn.trader/ctaEngine.py vn.trader/ctaStrategies.py vn.trader/ctaStrategyTemplate.py vn.trader/ctpGateway.py vn.trader/ltsGateway.py vn.trader/uiBasicWidget.py vn.trader/uiCtaWidget.py vn.trader/uiMainWindow.py vn.trader/vtConstant.py vn.trader/vtEngine.py vn.trader/vtGateway.py	2015-10-19 17:05:00 +08:00