aboutsummaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorpacien2018-01-14 23:11:42 +0100
committerpacien2018-01-14 23:11:42 +0100
commit12c9d15bc951dbc80832104f68e5c6e140bdb770 (patch)
treeaf3c51dd10ff06564eb5b29eba5e1f48ef8e5eea /build.xml
parent0a73db0e47a93dcf70be2ed75cd64e1762ae316c (diff)
parentc0dbbdc990a68a99b2d913bba9698d7e0894e924 (diff)
downloadwallj-12c9d15bc951dbc80832104f68e5c6e140bdb770.tar.gz
Merge branch 'master' of https://github.com/pacien/upem-java-wallj
Signed-off-by: pacien <pacien.trangirard@pacien.net> # Conflicts: # src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index ebd31dc..7720075 100644
--- a/build.xml
+++ b/build.xml
@@ -71,6 +71,7 @@
71 <zipfileset dir="${dir.lib}" includes="*.jar" prefix="${dir.zipsubdir}/${dir.lib}"/> 71 <zipfileset dir="${dir.lib}" includes="*.jar" prefix="${dir.zipsubdir}/${dir.lib}"/>
72 <zipfileset dir="${dir.javasrc}" includes="**/*.java" prefix="${dir.zipsubdir}/${dir.javasrc}"/> 72 <zipfileset dir="${dir.javasrc}" includes="**/*.java" prefix="${dir.zipsubdir}/${dir.javasrc}"/>
73 <zipfileset dir="${dir.docs}" includes="*.pdf" prefix="${dir.zipsubdir}/${dir.docs}"/> 73 <zipfileset dir="${dir.docs}" includes="*.pdf" prefix="${dir.zipsubdir}/${dir.docs}"/>
74 <zipfileset dir="${dir.docs}" includes="*.puml" prefix="${dir.zipsubdir}/${dir.docs}"/>
74 75
75 <zipfileset file="${file.ant}" prefix="${dir.zipsubdir}"/> 76 <zipfileset file="${file.ant}" prefix="${dir.zipsubdir}"/>
76 <zipfileset file="${file.jar}" prefix="${dir.zipsubdir}"/> 77 <zipfileset file="${file.jar}" prefix="${dir.zipsubdir}"/>