Merge branch 'master' of cgogn:~kraemer/CGoGN
+ correction in particle_cell_2D Conflicts: Apps/Examples/SocialAgents/include/env_generator.hpp Apps/Examples/SocialAgents/src/env_map.cpp
Please register or sign in to comment
+ correction in particle_cell_2D Conflicts: Apps/Examples/SocialAgents/include/env_generator.hpp Apps/Examples/SocialAgents/src/env_map.cpp