Remerged branch, and updated dev eclipse workspace.
This commit is contained in:
parent
f4070ff625
commit
3e1efdf05b
|
@ -316,7 +316,7 @@
|
||||||
<echo>
|
<echo>
|
||||||
Extracting fresh eclipse workspace to ${basedir}/eclipse
|
Extracting fresh eclipse workspace to ${basedir}/eclipse
|
||||||
</echo>
|
</echo>
|
||||||
<unzip src="${basedir}/eclipse-workspace.zip" dest="${basedir}"/>
|
<unzip src="${basedir}/eclipse-workspace-dev.zip" dest="${basedir}"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
|
<target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue