summaryrefslogtreecommitdiff
path: root/cad/meshlab/files/patch-meshlab_full.pro
diff options
context:
space:
mode:
Diffstat (limited to 'cad/meshlab/files/patch-meshlab_full.pro')
-rw-r--r--cad/meshlab/files/patch-meshlab_full.pro14
1 files changed, 0 insertions, 14 deletions
diff --git a/cad/meshlab/files/patch-meshlab_full.pro b/cad/meshlab/files/patch-meshlab_full.pro
deleted file mode 100644
index ba4db9e4826e..000000000000
--- a/cad/meshlab/files/patch-meshlab_full.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 \