quant1729
|
1141cd21e6
|
Merge branch 'futures' into master
Conflicts:
Algorithm.CSharp/QuantConnect.Algorithm.CSharp.csproj
Algorithm/QCAlgorithm.cs
Brokerages/InteractiveBrokers/InteractiveBrokersBrokerage.cs
Common/QuantConnect.csproj
Common/Securities/Option/Option.cs
Data/equity/usa/factor_files/aapl.csv
Data/symbol-properties/symbol-properties-database.csv
Engine/DataFeeds/Enumerators/Factories/BaseDataSubscriptionEnumeratorFactory.cs
Engine/DataFeeds/Enumerators/Factories/OptionChainUniverseSubscriptionEnumeratorFactory.cs
Engine/DataFeeds/SubscriptionDataReader.cs
ToolBox/QuantConnect.ToolBox.csproj
|
2016-11-07 16:18:11 +01:00 |
|