Commit Graph

3 Commits (95b26742eec08b0f216c1a3639bf48c7b10e6c98)

Author SHA1 Message Date
lcarlone e51d10f18c Merge branch 'develop' into feature/sphericalCamera
# Conflicts:
#	gtsam/geometry/CameraSet.h
#	gtsam_unstable/slam/SmartProjectionPoseFactorRollingShutter.h
#	gtsam_unstable/slam/tests/testSmartProjectionPoseFactorRollingShutter.cpp
2021-11-07 12:02:33 -05:00
Varun Agrawal b53657a48f Merging 'master' into 'wrap' 2021-04-21 00:01:06 -04:00
Varun Agrawal 31635bedbd Merging 'master' into 'wrap' 2021-04-20 17:05:32 -04:00