[*] Merged fresh master and resolved conflicts.
authorAlexandr Arutjunov <smal.root@gmail.com>
Thu, 6 Oct 2016 14:12:56 +0000 (17:12 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Thu, 6 Oct 2016 14:12:56 +0000 (17:12 +0300)
commit8c6ee48af5cfbf297859eaf78e0af2e981cc5413
treeb8a7874a65e1068a09efbb8a6668d27c3f0e9de7
parent9a4d693773da3d9fa741ee619e832c74ce14dbd4
parentb61aaf7ec4f3b7c0a5474abda9c889d199f87d66
[*] Merged fresh master and resolved conflicts.
code/Exporter.cpp
code/X3DImporter.cpp
code/X3DImporter.hpp
code/X3DImporter_Postprocess.cpp
code/X3DImporter_Rendering.cpp