Commit 2ac109f8 authored by Antoine's avatar Antoine

Merge branch 'master' of github.com:graphstream/gs-boids

Conflicts:
	src/org/graphstream/boids/BoidSpecies.java
	src/org/graphstream/boids/DemographicManager.java
parents 9165f51a 3481e169
......@@ -620,4 +620,4 @@ public class BoidSpecies implements Iterable<Boid> {
public Iterator<Boid> iterator() {
return boids.values().iterator();
}
}
\ No newline at end of file
}
......@@ -243,4 +243,4 @@ public class DemographicManager implements BoidGraphListener {
super.unregister(b);
}
}
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment