cad/meshlab/files/patch-meshlab_full.pro


1
2
3
4
5
6
7
8
9
10
11
12
13
14

--- meshlab_full.pro.orig	2011-09-20 12:57:22.000000000 +0200
+++ meshlab_full.pro	2011-09-20 12:57:35.000000000 +0200
@@ -63,11 +63,7 @@
 # projects
                 fgt/filter_aging \
                 fgt/filter_colorproc \
-<<<<<<< .mine
                 #fgt/filter_csg \
-=======
-#			fgt/filter_csg \
->>>>>>> .r5054
                 fgt/filter_func \
                 fgt/filter_ssynth \
                 fgt/filter_qhull \