Merge branch 'master' into generalize_source
# Conflicts: # VadereSimulator/src/org/vadere/simulator/control/scenarioelements/SourceController.java # VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java # VadereSimulator/tests/org/vadere/simulator/control/TestSourceControllerUsingConstantSpawnRate.java
Scenarios/.gitignore
0 → 100644