merge with charles

PlanetHunt · Dec 4, 2015 · 99a8069 · 99a8069
2 parents c826a52 + ab1fd69
commit 99a8069
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 3,554 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-OrekitJava/src/de/netsat/orekit/matlab
+OrekitJava/src/de/netsat/orekit/matlab/
 OrekitJava/pathdef.m
-.metadata
+.metadata/
+.recommanders
diff --git a/.metadata/.log b/.metadata/.log
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/26/606af5339e9a00151c8ce6615cc526aa b/.metadata/.plugins/org.eclipse.core.resources/.history/26/606af5339e9a00151c8ce6615cc526aa
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/57/604f5c2e9e9a00151c8ce6615cc526aa b/.metadata/.plugins/org.eclipse.core.resources/.history/57/604f5c2e9e9a00151c8ce6615cc526aa