Commit Graph

2 Commits (377b90941b7f5d1adfda059824e361780c555aa5)

Author SHA1 Message Date
Luca f8205bfe02 Merge branch 'develop' into feature/SmartFactors3
Conflicts:
	gtsam/geometry/CalibratedCamera.h
	gtsam/geometry/tests/testCalibratedCamera.cpp
	gtsam/geometry/triangulation.h
	gtsam/nonlinear/ExpressionFactor.h
	gtsam/slam/SmartProjectionFactor.h
	gtsam_unstable/slam/SmartStereoProjectionFactor.h
	tests/testExpressionFactor.cpp
2015-06-19 16:55:30 -04:00
dellaert 88d8543f12 Moved to tests 2015-03-06 08:48:01 -08:00