Commit Graph

9 Commits

Author SHA1 Message Date
msincenselee
2349499747 Merge remote-tracking branch 'remotes/origin/master' into vnpy/master
Conflicts:
	.gitignore
2016-07-02 10:16:51 +08:00
msincenselee
2e6d994a5d 实盘修改 2015-12-09 23:42:17 +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
golden
5dd8aafe0d add CMakeLists.txt to config environment for compiling api and readme 2015-10-13 16:41:45 +08:00
root
3e7557c69e linux 2015-10-09 06:07:15 +00:00
msincenselee
aa489ea31b mysql 2015-10-08 00:27:06 +08:00
WOLF
da1fb95ebf 修复了vn.ctp中的ReqOrderInsert函数bug,发布ctpdemo 2015-04-24 15:21:00 +08:00
WOLF
24e589ec6e 修复API中和GIL相关的一个bug,发布vn.demo 2015-04-20 16:48:12 +08:00
WOLF
5ece1a7f36 初步完成vn.ctp封装,完成md的测试,td的测试只进行了初步 2015-03-26 15:34:26 +08:00