From 2b5c75b1f6232a785a46de11a9cdc82f3d7b84cf Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 16 Feb 2006 06:35:23 +0000
Subject: turned off merging of Pd files

svn path=/trunk/; revision=4590
---
 CVSROOT/cvswrappers | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'CVSROOT')

diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers
index 056df332..65875700 100644
--- a/CVSROOT/cvswrappers
+++ b/CVSROOT/cvswrappers
@@ -61,6 +61,7 @@
 *.mov -k 'b'
 *.mpg -k 'b'
 *.mpeg -k 'b'
+*.mjpeg -k 'b'
 
 # DOCUMENTS
 *.pdf -k 'b'
@@ -81,8 +82,14 @@
 # MACOS X FILES
 *.pmsp -k 'b'
 
+# PD FILES
+# pd files can't be meaningfully merged, so copy instead
+# 2006-02-15 <hans@at.or.at>
+*.pd -m 'COPY'
+
 # prevent keyword replacement on imported sources
 # 2005-05-20 <hans@at.or.at>
 portaudio/* -k 'b'
 portaudio_osx/* -k 'b'
 portaudio_v18/* -k 'b'
+portmidi/* -k 'b'
-- 
cgit v1.2.1