Merge branch 'master' of cgogn:~vanhoey/CGoGN

12fe16e7 · Kenneth Vanhoey · b0cbdbcd · b1f02a89 · 12fe16e7
Commit 12fe16e7 authored May 12, 2011 by Kenneth Vanhoey
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

README.TXT README.TXT +0 -4

No files found.
--- a/README.TXT
+++ b/README.TXT
 Dépendences Linux:
 installer les paquets suivants:
-<<<<<<< HEAD
 cmake libXi-dev libXmu-dev freeglut3-dev libdevil-dev libglew-dev libgmp3-dev libxml2-dev libboost-dev libzip-dev libqt4-help qt4-designer qt4-dev-tools
-=======
-cmake libXi-dev libXmu-dev freeglut3-dev libdevil-dev libglew-dev libgmp3-dev libxml2-dev libboost-dev lizip-dev libqt4-dev qt4-designer qt4-dev-tools
->>>>>>> 84fe346d20a65b08cb049bffc98c793c70f687f2


 Pour compiler CGoGN: