1. 15 Mar, 2016 1 commit
    • Martin Marinov's avatar
      Merge branch 'VCI-master' into merge-from-VCI · e773b81a
      Martin Marinov authored
      Conflicts:
      	.gitignore
      	CMakeLists.txt
      	Config/CoMISoDefines.hh
      	NSolver/CBCSolver.cc
      	NSolver/CBCSolver.hh
      	NSolver/DOCloudCache.cc
      	NSolver/DOCloudJob.cc
      	NSolver/GUROBISolver.cc
      	NSolver/GUROBISolver.hh
      	NSolver/IPOPTSolver.cc
      	NSolver/IPOPTSolver.hh
      	NSolver/IPOPTSolverLean.cc
      	NSolver/IPOPTSolverLean.hh
      	NSolver/LeastSquaresProblem.cc
      	NSolver/LeastSquaresProblem.hh
      	Solver/ConstrainedSolverT.cc
      	Solver/Eigen_ToolsT.cc
      	Solver/GMM_Tools.hh
      	Solver/MISolver.cc
      	Solver/SparseQRSolverT.cc
      e773b81a
  2. 14 Mar, 2016 2 commits
  3. 18 Feb, 2016 1 commit
  4. 15 Feb, 2016 1 commit
  5. 10 Feb, 2016 6 commits
  6. 09 Feb, 2016 3 commits
  7. 05 Feb, 2016 2 commits
  8. 04 Feb, 2016 10 commits
  9. 28 Jan, 2016 1 commit
  10. 27 Jan, 2016 1 commit
  11. 08 Jan, 2016 1 commit
  12. 04 Jan, 2016 2 commits
  13. 18 Dec, 2015 9 commits