[PD-cvs] SF.net SVN: pure-data:[17468] trunk/externals/pix_opencv/examples

[zmoelnig at users.sourceforge.net]

Revision: 17468
          http://sourceforge.net/p/pure-data/svn/17468
Author:   zmoelnig
Date:     2015-05-13 13:06:02 +0000 (Wed, 13 May 2015)
Log Message:
-----------
fixed merge-conflicts

Modified Paths:
--------------
    trunk/externals/pix_opencv/examples/00_opencv_haarcascade+pix_image/00_opencv_haarcascade+pix_image.pd
    trunk/externals/pix_opencv/examples/02_opencv_motempl+particle_system/02_opencv_motempl+particle_system.pd
    trunk/externals/pix_opencv/examples/05_perspective_correction/05_perspective_correction.pd
    trunk/externals/pix_opencv/examples/05_perspective_correction/subprocess.pd

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.