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