1. 23 Jan, 2013 1 commit
  2. 21 Jan, 2013 2 commits
  3. 17 Jan, 2013 15 commits
  4. 16 Jan, 2013 5 commits
  5. 15 Jan, 2013 11 commits
  6. 14 Jan, 2013 6 commits
    • untereiner's avatar
      correction import volumetric meshes · 97325e21
      untereiner authored
      97325e21
    • Thomas Jund's avatar
      0f35dc93
    • untereiner's avatar
      Merge cgogn:~thery/CGoGN · f463bd36
      untereiner authored
      f463bd36
    • Sylvain Thery's avatar
      resolve framemanipulator bug · 56e99fc6
      Sylvain Thery authored
      56e99fc6
    • 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