Submodule 'jMAVlib' updated, use 'la4j' directly, not via 'jMAVlib'

katzfey · May 31, 2014 · 108281b · 108281b
1 parent 10fb0a6
commit 108281b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = jMAVlib
 	url = https://github.com/DrTon/jMAVlib.git
 	branch = master
+[submodule "la4j"]
+	path = la4j
+	url = https://github.com/vkostyukov/la4j.git
diff --git a/jMAVSim.iml b/jMAVSim.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/jMAVlib/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/jMAVlib/la4j/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/la4j/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/jMAVSim.ipr b/jMAVSim.ipr
@@ -182,6 +182,7 @@
     <mapping directory="" vcs="" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/jMAVlib" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/la4j" vcs="Git" />
   </component>
   <component name="libraryTable">
     <library name="lib">

diff --git a/jMAVlib b/jMAVlib
diff --git a/la4j b/la4j