Commit a227682b authored by Guylaine Prat's avatar Guylaine Prat
Browse files

Merge remote-tracking branch 'origin/master' into merge_rugged_refining

Conflicts:
	pom.xml
	src/test/java/org/orekit/rugged/api/RuggedTest.java
parents dc85715a 373de3dd
Supports Markdown
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