glaville / mcmas

Download as
Browse Code ยป

Commit 1d0884a7200f260336f613a96ee848e5c8ad7187

Authored by glaville
2 parents e849b630f0 a4185c0f34

Merge branch 'master' of https://disc.univ-fcomte.fr/gitlab/guillaume.laville/mcmas 

Conflicts:
	ivy.xml
	src/mcmas/core/MCMContext.java
	src/mcmas/plugins/axb/AXBPlugin.java
	src/mcmas/plugins/gridsearch/GridSearchPlugin.java
	src/preypredator/PPRuntimeGPU.java
	src/preypredator/PreyPredator2.java
	utils/mcmas/infos.sh

Showing 1 changed file Side-by-side Diff

ivy.xml View file @ 1d0884a
... ... @@ -3,7 +3,7 @@
3 3 <configurations>
4 4 <conf name="default"/>
5 5 </configurations>
6   -
  6 +
7 7 <dependencies>
8 8 <dependency org="org.geotools" name="gt-shapefile-ng" rev="8.6"/>
9 9 <dependency org="jfree" name="jfreechart" rev="1.0.13"/>