1. 14 Jan, 2013 4 commits
    • untereiner's avatar
      q corrections bug · f00797e5
      untereiner authored
      f00797e5
    • untereiner's avatar
      Merge cgogn:~thery/CGoGN · 8ce52f3c
      untereiner authored
      Conflicts:
      	include/Algo/Geometry/centroid.h
      	include/Algo/Geometry/centroid.hpp
      	include/Algo/Import/importMesh.hpp
      	include/Algo/Import/importNodeEle.hpp
      	include/Algo/Import/importObjEle.hpp
      	include/Algo/Import/importTet.hpp
      	include/Algo/Import/importTs.hpp
      	include/Algo/Modelisation/polyhedron.hpp
      	include/Algo/Modelisation/primitives3d.hpp
      	include/Algo/Modelisation/subdivision.h
      	include/Algo/Modelisation/subdivision.hpp
      	include/Algo/Multiresolution/Map2MR/Filters/bertram.h
      	include/Algo/Multiresolution/Map2MR/Filters/lerp.h
      	include/Algo/Multiresolution/Map3MR/Filters/lerp.h
      	include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
      	include/Topology/generic/attributeHandler.h
      	src/Topology/map/map3.cpp
      	src/Utils/Shaders/shaderSimpleTexture.cpp
      8ce52f3c
    • Sylvain Thery's avatar
      afad58ac
    • Sylvain Thery's avatar
      add Surface namespace in ProgressiveMesh · ce89d70a
      Sylvain Thery authored
      ce89d70a
  2. 11 Jan, 2013 5 commits
  3. 10 Jan, 2013 5 commits
  4. 09 Jan, 2013 4 commits
  5. 04 Jan, 2013 2 commits
  6. 30 Dec, 2012 1 commit
  7. 26 Dec, 2012 1 commit
  8. 23 Dec, 2012 1 commit
  9. 21 Dec, 2012 5 commits
  10. 20 Dec, 2012 3 commits
  11. 19 Dec, 2012 2 commits
  12. 18 Dec, 2012 3 commits
  13. 17 Dec, 2012 4 commits