Merge remote-tracking branch 'bitbucket/feature/ImuFactorPush2' into manifold

Conflicts:
	gtsam/navigation/ScenarioRunner.h
	gtsam/navigation/tests/testScenarioRunner.cpp
release/4.3a0
Frank 2016-01-25 14:21:28 -08:00
commit 63fe8b9d17
1 changed files with 1811 additions and 1805 deletions

3616
.cproject

File diff suppressed because it is too large Load Diff