Merge branch 'master' of cgogn:~jund/CGoGN_Apps/SocialAgents2
Conflicts: Debug/CMakeLists.txt Release/CMakeLists.txt include/env_render.h include/viewer.h src/simulator.cpp src/viewer.cpp
include/gl2ps.h
0 → 100644
Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile
Conflicts: Debug/CMakeLists.txt Release/CMakeLists.txt include/env_render.h include/viewer.h src/simulator.cpp src/viewer.cpp