Skip to content
Snippets Groups Projects
Commit 1b786f94 authored by sesteves's avatar sesteves
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/orekit/rugged/api/Rugged.java
#	src/main/java/org/orekit/rugged/errors/RuggedMessages.java
#	src/main/java/org/orekit/rugged/refraction/AtmosphericRefraction.java
#	src/main/java/org/orekit/rugged/refraction/MultiLayerModel.java
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_de.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_en.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_es.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_fr.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_gl.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_it.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_no.utf8
#	src/main/resources/assets/org/orekit/rugged/RuggedMessages_ro.utf8
#	src/test/java/org/orekit/rugged/errors/RuggedMessagesTest.java
#	src/test/java/org/orekit/rugged/refraction/MultiLayerModelTest.java
parents bd39a28b b3c4bc2c
No related branches found
No related tags found
No related merge requests found
......@@ -55,6 +55,7 @@ import org.orekit.rugged.linesensor.LineSensor;
import org.orekit.rugged.linesensor.SensorMeanPlaneCrossing;
import org.orekit.rugged.linesensor.SensorPixel;
import org.orekit.rugged.linesensor.SensorPixelCrossing;
import org.orekit.rugged.refraction.AtmosphericRefraction;
import org.orekit.rugged.utils.DSGenerator;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.NormalizedGeodeticPoint;
......
......@@ -72,7 +72,7 @@ TILE_ALREADY_DEFINED = <MISSING TRANSLATION>
# unknown tile {0}, line {1}, file {2}: {3}
UNKNOWN_TILE = <MISSING TRANSLATION>
# no parameters have been selected for estimation
NO_PARAMETERS_SELECTED = <MISSING TRANSLATION>
......
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