Commit Graph

8 Commits

Author SHA1 Message Date
msincenselee
9c43f0097f 合并版本前初始化vnpy 2016-07-02 11:12:56 +08:00
msincenselee
6e31097276 Merge remote-tracking branch 'remotes/origin/master' into vnpy/master
Conflicts:
	.gitignore
2016-07-02 11:00:05 +08:00
msincenselee
2e6d994a5d 实盘修改 2015-12-09 23:42:17 +08:00
msincenselee
43f96b1e05 201501105 2015-11-05 00:28:12 +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
zedyang
7e847e73f5 update docs 2015-08-17 11:25:54 +08:00
zedyang
444269a50c 通联历史数据模块。 2015-08-14 16:26:41 +08:00
WOLF
1e793c15f9 创建通联数据历史数据模块,等待zed的代码。
vn.trader模块开发进行中。
2015-08-14 16:11:53 +08:00