Commit Graph

2 Commits (1cd33cb11e5b4d37870db31aaa3e80fc67bf1662)

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
Jose Luis Blanco Claraco 8cb22624e0
Use camel case for cmake files 2020-10-07 17:02:55 +02:00