Skip to content
GitLab
  1. 27 Apr, 2011 2 commits
    • Sylvain Thery's avatar
      re-ajout image fonte · 0603269f
      Sylvain Thery authored
      0603269f
    • CGoGN GIT Supervisor's avatar
      Merge branch 'master' of /home/untereiner/CGoGN · c5e64b5b
      CGoGN GIT Supervisor authored 
      * 'master' of /home/untereiner/CGoGN:
  Derniere changements
  import des fichiers de l'iness + IHM3
  Revert "Merge branch 'master' of cgogn:~thery/CGoGN"
  retour dans le namespace IHM
  encore quelques modifs sur les 3-cartes

Conflicts:
	Apps/Tuto/tuto5.cpp
	include/Algo/Export/exportPov.h
	include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
	include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
	include/Utils/GLSLShader.h
	include/Utils/text3d.h
	src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
	src/Utils/GLSLShader.cpp
	src/Utils/text3d.cpp
      c5e64b5b
  3. 26 Apr, 2011 9 commits
  5. 21 Apr, 2011 1 commit
  7. 20 Apr, 2011 2 commits
  9. 18 Apr, 2011 2 commits
  11. 15 Apr, 2011 1 commit
  13. 06 Apr, 2011 2 commits
  15. 05 Apr, 2011 5 commits
  17. 04 Apr, 2011 4 commits
  19. 01 Apr, 2011 1 commit
  21. 30 Mar, 2011 1 commit
  23. 29 Mar, 2011 1 commit
  25. 25 Mar, 2011 1 commit
  27. 22 Mar, 2011 2 commits
  29. 21 Mar, 2011 1 commit
  31. 18 Mar, 2011 1 commit
  33. 16 Mar, 2011 4 commits