Remerged branch, and updated dev eclipse workspace.

2012-12-08 17:08:51 -08:00 · 2012-12-08 17:08:51 -08:00 · 3e1efdf05b
parent f4070ff625
commit 3e1efdf05b
3 changed files with 1 additions and 1 deletions
--- a/fml/build.xml
+++ b/fml/build.xml
@ -316,7 +316,7 @@
    <echo>
      Extracting fresh eclipse workspace to ${basedir}/eclipse
    </echo>
-    <unzip src="${basedir}/eclipse-workspace.zip" dest="${basedir}"/>
+    <unzip src="${basedir}/eclipse-workspace-dev.zip" dest="${basedir}"/>
  </target>

  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
--- a/fml/eclipse-workspace-dev.zip
+++ b/fml/eclipse-workspace-dev.zip
--- a/fml/eclipse-workspace.zip
+++ b/fml/eclipse-workspace.zip