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
							
						 | 
						
							
							
							
							
								
							
								f924d01bc3
								
							
								
							
						 | 
						
							
							
								
								Synchronized mixed case naming
							
							
							
							
							
						 | 
						
							2012-06-03 05:25:05 +00:00 | 
						
					
				
					
						
							
							
								 
								Richard Roberts
							
						 | 
						
							
							
							
							
								
							
								c2c9c4a982
								
							
								
							
						 | 
						
							
							
								
								Almost everything compiles and passes in windows
							
							
							
							
							
						 | 
						
							2012-05-23 18:51:49 +00:00 | 
						
					
				
					
						
							
							
								 
								Richard Roberts
							
						 | 
						
							
							
							
							
								
							
								516e1610a1
								
							
								
							
						 | 
						
							
							
								
								Added joint marginals and unit tests
							
							
							
							
							
						 | 
						
							2012-05-15 00:01:38 +00:00 | 
						
					
				
					
						
							
							
								 
								Richard Roberts
							
						 | 
						
							
							
							
							
								
							
								51d38f4b5d
								
							
								
							
						 | 
						
							
							
								
								Added Marginals unit test and class
							
							
							
							
							
						 | 
						
							2012-05-14 21:33:03 +00:00 |