1. 21 Nov, 2012 1 commit
  2. 20 Nov, 2012 1 commit
  3. 19 Nov, 2012 8 commits
  4. 16 Nov, 2012 13 commits
  5. 15 Nov, 2012 4 commits
  6. 14 Nov, 2012 12 commits
  7. 13 Nov, 2012 1 commit
    • untereiner's avatar
      Merge cgogn:~thery/CGoGN · d7f201ae
      untereiner authored
      Conflicts:
      	include/Algo/Decimation/edgeSelector.h
      	include/Algo/Modelisation/tetrahedralization.hpp
      	include/Algo/Multiresolution/Map2MR/map2MR_PM.hpp
      	include/Algo/Multiresolution/Map3MR/map3MR_PrimalAdapt.hpp
      	include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
      	include/Algo/Selection/raySelector.hpp
      	include/Topology/map/map2.h
      	src/Topology/map/map2.cpp
      d7f201ae