Skip to content
Snippets Groups Projects
Commit 5da02d5f authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Merge branch 'develop' into dsst-od

Conflicts:
	pom.xml
	src/main/java/org/orekit/estimation/leastsquares/BatchLSEstimator.java
	src/main/java/org/orekit/propagation/conversion/NumericalPropagatorBuilder.java
	src/main/java/org/orekit/propagation/integration/AbstractIntegratedPropagator.java
	src/main/java/org/orekit/propagation/integration/FieldAbstractIntegratedPropagator.java
	src/main/java/org/orekit/propagation/integration/FieldAdditionalEquations.java
	src/main/java/org/orekit/propagation/numerical/DSConverter.java
	src/main/java/org/orekit/propagation/semianalytical/dsst/forces/AbstractGaussianContribution.java
	src/main/java/org/orekit/propagation/semianalytical/dsst/forces/DSSTSolarRadiationPressure.java
parents 64693e00 ff51eb67
No related branches found
No related tags found
No related merge requests found
Showing
with 1020 additions and 226 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment