Commit Graph

2 Commits (fed2c8b6849205598ea97c4826260ac85ba8eabb)

Author SHA1 Message Date
dellaert a94835a2e4 Merge remote-tracking branch 'origin/develop' into feature/BAD
Conflicts:
	.cproject
	gtsam/geometry/Cal3DS2.cpp
	gtsam/geometry/Cal3DS2.h
	gtsam/geometry/Cal3Unified.h
	gtsam/navigation/CombinedImuFactor.h
	gtsam/navigation/ImuFactor.h
	gtsam/nonlinear/NonlinearFactor.h
	gtsam/slam/tests/testPoseRotationPrior.cpp

Modified: testGaussMarkov1stOrderFactor.cpp, testPoseRotationPrior.cpp
2014-11-04 17:04:57 +01:00
Luca 7a4f307342 moved biasedGPS and GaussMarkov to unstable 2014-10-06 13:11:40 -04:00