gtsam/gtsam_unstable
dellaert f9c353d4a5 Merge remote-tracking branch 'origin/develop' into feature/SoundSlam
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
2014-12-28 17:45:41 +01:00
..
base Converted Vector(2|3) << ... to Vector2(...) or Vector3(...) syntax 2014-11-23 10:22:25 -08:00
discrete Coding convention: convert tabs to two spaces 2014-10-30 12:44:46 -04:00
dynamics traits_x -> traits 2014-12-26 16:47:51 +01:00
examples use ExpressionFactorGraph 2014-12-13 08:35:22 +01:00
geometry Merge remote-tracking branch 'origin/develop' into feature/SoundSlam 2014-12-28 17:45:41 +01:00
linear traits_x -> traits 2014-12-26 16:47:51 +01:00
nonlinear Merge remote-tracking branch 'origin/develop' into feature/SoundSlam 2014-12-28 17:45:41 +01:00
partition sync with develop branch commit c1f048d 2014-12-12 18:46:54 -05:00
slam Merge remote-tracking branch 'origin/develop' into feature/SoundSlam 2014-12-28 17:45:41 +01:00
testing_tools
timing Moved include file 2014-12-28 16:44:32 +01:00
CMakeLists.txt remove lpsolve 2014-12-16 11:27:20 -05:00
gtsam_unstable.h sync with develop branch commit c1f048d 2014-12-12 18:46:54 -05:00
mainpage.dox