Richard Roberts
|
9c8377f476
|
Merge remote-tracking branch 'svn/trunk' into windows
Conflicts:
examples/Pose2SLAMExample.cpp
examples/vSLAMexample/CMakeLists.txt
examples/vSLAMexample/vISAMexample.cpp
gtsam/nonlinear/ISAM2-impl.cpp
gtsam/slam/pose2SLAM.cpp
gtsam/slam/tests/testGeneralSFMFactor.cpp
gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
gtsam/slam/tests/testPlanarSLAM.cpp
gtsam/slam/tests/testPose2SLAM.cpp
tests/testDoglegOptimizer.cpp
tests/testGraph.cpp
|
2012-06-04 14:13:37 +00:00 |
Frank Dellaert