vnpy/.gitignore

# C++源代码
ipch/
Release/

*.sdf
*.sln
*.suo
*.exp
*.pdb
*.filters
*.vcxproj
*.cd

# Python编译文件
*.pyc

# WingIDE文件
*.wpr
*.wpu

# 压缩文件
*.zip

# API的.con文件
*.con

# visual studio
*.opensdf

# 本地持久化文件
*.vn

# word文档
*.doc
*.docx

# 其他文件
*.dump
*.vssettings
<<<<<<< HEAD
vnpy.pyproj.user
.idea/workspace.xml
.idea/.name
.idea/vnpy.iml
*.xml
=======

<<<<<<< HEAD
# 不想同步的
*.local
=======
vn.ctp/build/*
vn.lts/build/*
.idea
>>>>>>> 65aac25731772259bf2d4049e7adbe92750ea01d
>>>>>>> refs/remotes/vnpy/master
*.json
*.json
*.json
初步完成了LTS API的行情MD和交易TD封装，以及MD的测试脚本，LTS API版本20150115 2015-03-02 05:05:53 +00:00			`# C++源代码`
			`ipch/`
			`Release/`

			`*.sdf`
			`*.sln`
			`*.suo`
			`*.exp`
			`*.pdb`
			`*.filters`
			`*.vcxproj`
			`*.cd`

			`# Python编译文件`
			`*.pyc`

			`# WingIDE文件`
			`*.wpr`
			`*.wpu`

			`# 压缩文件`
			`*.zip`

			`# API的.con文件`
将vn.lts的td api中部分原本手工修改的代码改为自动生成，用于防止空指针的问题 2015-03-26 07:47:39 +00:00			`*.con`

			`# visual studio`
LTSDEMO加入了登录时，行情和交易使用不同密码的功能 2015-05-11 01:34:26 +00:00			`*.opensdf`

			`# 本地持久化文件`
修复部分vn.strategy的bug 2015-05-28 02:09:59 +00:00			`*.vn`

			`# word文档`
			`*.doc`
添加部分忽略 2015-09-09 01:24:43 +00:00			`*.docx`

			`# 其他文件`
			`*.dump`
mysql 2015-10-07 16:27:06 +00:00			`*.vssettings`
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 09:05:00 +00:00			`<<<<<<< HEAD`
mysql 2015-10-07 16:27:06 +00:00			`vnpy.pyproj.user`
			`.idea/workspace.xml`
			`.idea/.name`
			`.idea/vnpy.iml`
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 09:05:00 +00:00			`*.xml`
			`=======`

			`<<<<<<< HEAD`
			`# 不想同步的`
			`*.local`
			`=======`
			`vn.ctp/build/*`
			`vn.lts/build/*`
			`.idea`
			`>>>>>>> 65aac25731772259bf2d4049e7adbe92750ea01d`
			`>>>>>>> refs/remotes/vnpy/master`
			`*.json`
			`*.json`
			`*.json`