src/ArticulatedObject.cpp · 9d618d9723bc204cf5f73d450f8b410bd2e6a331 · Thomas Pitiot / SocialAgents3D · GitLab

Find file Blame History Permalink

Merge branch 'develop' of icube-forge.unistra.fr:pitiot/volusion into develop · 9d618d97
Etienne Schmitt authored Mar 18, 2015
```
# Conflicts:
#	include/env_map.h
#	src/env_map.cpp
Signed-off-by: Étienne Schmitt <etienne.schmitt@inria.fr>
```
9d618d97

ArticulatedObject.cpp 5.1 KB