vnpy/vn.trader
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
..
ContractData.vt
CTA_setting.json Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ctaConstant.py
ctaEngine.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ctaStrategies.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ctaStrategyTemplate.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
CTP_connect.json Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ctpDataType.py
ctpGateway.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
eventEngine.py
eventType.py
IB_connect.json Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ibGateway.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
LTS_connect.json Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
ltsDataType.py
ltsGateway.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
securitymduserapi.dll
securityqueryapi.dll
securitytraderapi.dll
thostmduserapi.dll
thosttraderapi.dll
uiBasicWidget.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
uiCtaWidget.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
uiMainWindow.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
vnctpmd.pyd
vnctptd.pyd
vnltsmd.pyd
vnltsqry.pyd
vnltstd.pyd
vnpy.ico
vtConstant.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
vtEngine.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
vtFunction.py
vtGateway.py Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-10-19 17:05:00 +08:00
vtMain.py
windGateway.py