From 6e7914089cf8ad6290f803ef8c2a78bc627bf8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@users.sourceforge.net>
Date: Wed, 13 May 2015 13:06:02 +0000
Subject: fixed merge-conflicts

svn path=/trunk/externals/pix_opencv/; revision=17468
---
 examples/05_perspective_correction/subprocess.pd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'examples/05_perspective_correction/subprocess.pd')

diff --git a/examples/05_perspective_correction/subprocess.pd b/examples/05_perspective_correction/subprocess.pd
index 55b53ac..8f6a239 100644
--- a/examples/05_perspective_correction/subprocess.pd
+++ b/examples/05_perspective_correction/subprocess.pd
@@ -1,4 +1,5 @@
-#N canvas 745 670 837 384 10;
+#N canvas 528 380 837 384 10;
+#X declare -lib Gem;
 #X obj 313 153 gemhead;
 #X obj 313 198 pix_image;
 #X msg 374 162 open pattern.png;
@@ -42,6 +43,7 @@ move in the 05_perspective_correction window;
 -262144 -1 -1 12.15 256;
 #X obj 667 141 nbx 5 14 -1e+37 1e+37 0 1 empty empty rotZ 0 -8 0 10
 -262144 -1 -1 -157.27 256;
+#X obj 179 63 declare -lib Gem;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 2 0 1 0;
-- 
cgit v1.2.1