Commit Graph

4 Commits (dff2fc6de2b8446dc1b12c354032067d36728d2d)

Author SHA1 Message Date
Richard Roberts bef45d5b7b Merged from branch 'branches/windows' 2012-06-05 14:09:58 +00:00
Frank Dellaert 10d6157d1d formatting/naming only 2012-06-05 13:29:04 +00:00
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 0baa83cf45 Another rename 2012-06-03 20:11:40 +00:00