Conflicts: .cproject gtsam/base/LieMatrix.h gtsam/base/LieVector.h gtsam/base/OptionalJacobian.h gtsam/base/tests/testOptionalJacobian.cpp gtsam/geometry/Cal3_S2Stereo.h gtsam/geometry/CalibratedCamera.h gtsam/geometry/PinholeCamera.h gtsam/geometry/Point2.h gtsam/geometry/Point3.h gtsam/geometry/Pose2.cpp gtsam/geometry/Pose2.h gtsam/geometry/Pose3.cpp gtsam/geometry/Pose3.h gtsam/geometry/Rot2.cpp gtsam/geometry/Rot2.h gtsam/geometry/Rot3.cpp gtsam/geometry/Rot3.h gtsam/geometry/Rot3M.cpp gtsam/geometry/Rot3Q.cpp gtsam/geometry/Unit3.cpp gtsam/geometry/tests/testRot3.cpp gtsam/nonlinear/AdaptAutoDiff.h gtsam/nonlinear/Expression-inl.h gtsam/nonlinear/Expression.h gtsam/nonlinear/tests/testExpression.cpp gtsam/slam/RangeFactor.h timing/timeAdaptAutoDiff.cpp timing/timeCameraExpression.cpp |
||
|---|---|---|
| .. | ||
| tests | ||
| BearingS2.cpp | ||
| BearingS2.h | ||
| CMakeLists.txt | ||
| Event.h | ||
| InvDepthCamera3.h | ||
| Pose3Upright.cpp | ||
| Pose3Upright.h | ||
| SimPolygon2D.cpp | ||
| SimPolygon2D.h | ||
| SimWall2D.cpp | ||
| SimWall2D.h | ||