Merge branch 'master' of github.com:codebase/Lattice-Development

codebase · Apr 10, 2012 · e516262 · e516262
2 parents 12607ed + 589ec33
commit e516262
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -47,14 +47,18 @@
     <exec executable="git">
       <arg value="pull"/>
     </exec>
-    <exec executable="git" dir="modules/lattice">
-      <arg value="pull"/>
-    </exec>  
     <exec executable="git">
       <arg value="submodule"/>
       <arg value="update"/>
       <arg value="--recursive"/>
     </exec>
+    <exec executable="git" dir="modules/lattice">
+      <arg value="checkout"/>
+      <arg value="master"/>
+    </exec>  
+    <exec executable="git" dir="modules/lattice">
+      <arg value="pull"/>
+    </exec>  
   </target>
 
   <target name="test">