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

Merge branch 'public' 

Conflicts:
	src/main/java/org/orekit/propagation/AnalyticalPropagator.java
	src/main/java/org/orekit/propagation/events/AdaptedEventDetector.java
	src/main/java/org/orekit/propagation/numerical/NumericalPropagator.java
	src/site/xdoc/changes.xml
parents 47eb0dae ef770553
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 514 additions and 808 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment